summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/asterisk.c20
-rw-r--r--main/bridge_basic.c12
-rw-r--r--main/media_index.c121
-rw-r--r--main/sounds_index.c9
-rw-r--r--main/translate.c2
-rw-r--r--res/res_pjsip/pjsip_configuration.c17
6 files changed, 104 insertions, 77 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 2c86d1ebc..faac569c0 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3012,19 +3012,26 @@ static char *cli_prompt(EditLine *editline)
static struct ast_vector_string *ast_el_strtoarr(char *buf)
{
char *retstr;
+ char *bestmatch;
struct ast_vector_string *vec = ast_calloc(1, sizeof(*vec));
if (!vec) {
return NULL;
}
+ /* bestmatch must not be deduplicated */
+ bestmatch = strsep(&buf, " ");
+ if (!bestmatch || !strcmp(bestmatch, AST_CLI_COMPLETE_EOF)) {
+ goto vector_cleanup;
+ }
+
while ((retstr = strsep(&buf, " "))) {
if (!strcmp(retstr, AST_CLI_COMPLETE_EOF)) {
break;
}
/* Older daemons sent duplicates. */
- if (AST_VECTOR_GET_CMP(vec, retstr, strcasecmp)) {
+ if (AST_VECTOR_GET_CMP(vec, retstr, !strcasecmp)) {
continue;
}
@@ -3036,7 +3043,9 @@ static struct ast_vector_string *ast_el_strtoarr(char *buf)
}
}
- if (!AST_VECTOR_SIZE(vec)) {
+ bestmatch = ast_strdup(bestmatch);
+ if (!bestmatch || AST_VECTOR_INSERT_AT(vec, 0, bestmatch)) {
+ ast_free(bestmatch);
goto vector_cleanup;
}
@@ -4632,10 +4641,15 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
check_init(init_manager(), "Asterisk Manager Interface");
check_init(ast_enum_init(), "ENUM Support");
check_init(ast_cc_init(), "Call Completion Supplementary Services");
- check_init(ast_sounds_index_init(), "Sounds Indexer");
check_init(load_modules(0), "Module");
/*
+ * This is initialized after the dynamic modules load to avoid repeatedly
+ * reindexing sounds for every format module load.
+ */
+ check_init(ast_sounds_index_init(), "Sounds Indexer");
+
+ /*
* This has to load after the dynamic modules load, as items in the media
* cache can't be constructed from items in the AstDB without their
* bucket backends.
diff --git a/main/bridge_basic.c b/main/bridge_basic.c
index 6b393f4ed..68138bdcc 100644
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@ -3215,9 +3215,9 @@ static int grab_transfer(struct ast_channel *chan, char *exten, size_t exten_len
} else if (!res) {
/* 0 for invalid extension dialed. */
if (ast_strlen_zero(exten)) {
- ast_verb(4, "%s dialed no digits.\n", ast_channel_name(chan));
+ ast_verb(3, "Channel %s: Dialed no digits.\n", ast_channel_name(chan));
} else {
- ast_verb(4, "%s dialed '%s@%s' does not exist.\n",
+ ast_verb(3, "Channel %s: Dialed '%s@%s' does not exist.\n",
ast_channel_name(chan), exten, context);
}
if (attempts < max_attempts) {
@@ -3304,6 +3304,9 @@ static int feature_attended_transfer(struct ast_bridge_channel *bridge_channel,
/* Inhibit the bridge before we do anything else. */
bridge = ast_bridge_channel_merge_inhibit(bridge_channel, +1);
+ ast_verb(3, "Channel %s: Started DTMF attended transfer.\n",
+ ast_channel_name(bridge_channel->chan));
+
if (strcmp(bridge->v_table->name, "basic")) {
ast_log(LOG_ERROR, "Channel %s: Attended transfer attempted on unsupported bridge type '%s'.\n",
ast_channel_name(bridge_channel->chan), bridge->v_table->name);
@@ -3473,6 +3476,9 @@ static int feature_blind_transfer(struct ast_bridge_channel *bridge_channel, voi
const char *xfer_context;
char *goto_on_blindxfr;
+ ast_verb(3, "Channel %s: Started DTMF blind transfer.\n",
+ ast_channel_name(bridge_channel->chan));
+
ast_bridge_channel_write_hold(bridge_channel, NULL);
ast_channel_lock(bridge_channel->chan);
@@ -3496,7 +3502,7 @@ static int feature_blind_transfer(struct ast_bridge_channel *bridge_channel, voi
const char *chan_exten;
int chan_priority;
- ast_debug(1, "After transfer, transferrer %s goes to %s\n",
+ ast_debug(1, "Channel %s: After transfer, transferrer goes to %s\n",
ast_channel_name(bridge_channel->chan), goto_on_blindxfr);
ast_channel_lock(bridge_channel->chan);
diff --git a/main/media_index.c b/main/media_index.c
index 3e3824580..60bdfe3fd 100644
--- a/main/media_index.c
+++ b/main/media_index.c
@@ -45,10 +45,10 @@
/*! \brief Structure to hold a list of the format variations for a media file for a specific variant */
struct media_variant {
AST_DECLARE_STRING_FIELDS(
- AST_STRING_FIELD(variant); /*!< The variant this media is available in */
AST_STRING_FIELD(description); /*!< The description of the media */
);
struct ast_format_cap *formats; /*!< The formats this media is available in for this variant */
+ char variant[0]; /*!< The variant this media is available in */
};
static void media_variant_destroy(void *obj)
@@ -61,20 +61,23 @@ static void media_variant_destroy(void *obj)
static struct media_variant *media_variant_alloc(const char *variant_str)
{
- RAII_VAR(struct media_variant *, variant, ao2_alloc(sizeof(*variant), media_variant_destroy), ao2_cleanup);
+ size_t str_sz = strlen(variant_str) + 1;
+ struct media_variant *variant;
- if (!variant || ast_string_field_init(variant, 8)) {
+ variant = ao2_alloc(sizeof(*variant) + str_sz, media_variant_destroy);
+ if (!variant) {
return NULL;
}
+ memcpy(variant->variant, variant_str, str_sz);
+
variant->formats = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
- if (!variant->formats) {
+ if (!variant->formats || ast_string_field_init(variant, 8)) {
+ ao2_ref(variant, -1);
+
return NULL;
}
- ast_string_field_set(variant, variant, variant_str);
-
- ao2_ref(variant, 1);
return variant;
}
@@ -93,37 +96,35 @@ static int media_variant_cmp(void *obj, void *arg, int flags)
/*! \brief Structure to hold information about a media file */
struct media_info {
- AST_DECLARE_STRING_FIELDS(
- AST_STRING_FIELD(name); /*!< The file name of the media */
- );
- struct ao2_container *variants; /*!< The variants for which this media is available */
+ struct ao2_container *variants; /*!< The variants for which this media is available */
+ char name[0]; /*!< The file name of the media */
};
static void media_info_destroy(void *obj)
{
struct media_info *info = obj;
- ast_string_field_free_memory(info);
ao2_cleanup(info->variants);
- info->variants = NULL;
}
static struct media_info *media_info_alloc(const char *name)
{
- RAII_VAR(struct media_info *, info, ao2_alloc(sizeof(*info), media_info_destroy), ao2_cleanup);
+ size_t name_sz = strlen(name) + 1;
+ struct media_info *info = ao2_alloc(sizeof(*info) + name_sz, media_info_destroy);
- if (!info || ast_string_field_init(info, 128)) {
+ if (!info) {
return NULL;
}
+ memcpy(info->name, name, name_sz);
+
info->variants = ao2_container_alloc(VARIANT_BUCKETS, media_variant_hash, media_variant_cmp);
if (!info->variants) {
+ ao2_ref(info, -1);
+
return NULL;
}
- ast_string_field_set(info, name, name);
-
- ao2_ref(info, 1);
return info;
}
@@ -141,38 +142,37 @@ static int media_info_cmp(void *obj, void *arg, int flags)
}
struct ast_media_index {
- AST_DECLARE_STRING_FIELDS(
- AST_STRING_FIELD(base_dir); /*!< Base directory for indexing */
- );
struct ao2_container *index; /*!< The index of media that has requested */
struct ao2_container *media_list_cache; /*!< Cache of filenames to prevent them from being regenerated so often */
+ char base_dir[0]; /*!< Base directory for indexing */
};
static void media_index_dtor(void *obj)
{
struct ast_media_index *index = obj;
+
ao2_cleanup(index->index);
- index->index = NULL;
ao2_cleanup(index->media_list_cache);
- index->media_list_cache = NULL;
- ast_string_field_free_memory(index);
}
struct ast_media_index *ast_media_index_create(const char *base_dir)
{
- RAII_VAR(struct ast_media_index *, index, ao2_alloc(sizeof(*index), media_index_dtor), ao2_cleanup);
- if (!index || ast_string_field_init(index, 64)) {
+ size_t base_dir_sz = strlen(base_dir) + 1;
+ struct ast_media_index *index = ao2_alloc(sizeof(*index) + base_dir_sz, media_index_dtor);
+
+ if (!index) {
return NULL;
}
- ast_string_field_set(index, base_dir, base_dir);
+ memcpy(index->base_dir, base_dir, base_dir_sz);
index->index = ao2_container_alloc(INDEX_BUCKETS, media_info_hash, media_info_cmp);
if (!index->index) {
+ ao2_ref(index, -1);
+
return NULL;
}
- ao2_ref(index, +1);
return index;
}
@@ -191,8 +191,8 @@ static struct media_variant *find_variant(struct ast_media_index *index, const c
/*! \brief create the appropriate media_variant and any necessary structures */
static struct media_variant *alloc_variant(struct ast_media_index *index, const char *filename, const char *variant_str)
{
- RAII_VAR(struct media_info *, info, NULL, ao2_cleanup);
- RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup);
+ struct media_info *info;
+ struct media_variant *variant = NULL;
info = ao2_find(index->index, filename, OBJ_KEY);
if (!info) {
@@ -204,21 +204,21 @@ static struct media_variant *alloc_variant(struct ast_media_index *index, const
}
ao2_link(index->index, info);
+ } else {
+ variant = ao2_find(info->variants, variant_str, OBJ_KEY);
}
- variant = ao2_find(info->variants, variant_str, OBJ_KEY);
if (!variant) {
/* This is the first time the index has seen this variant for
* this filename, allocate and link */
variant = media_variant_alloc(variant_str);
- if (!variant) {
- return NULL;
+ if (variant) {
+ ao2_link(info->variants, variant);
}
-
- ao2_link(info->variants, variant);
}
- ao2_ref(variant, +1);
+ ao2_ref(info, -1);
+
return variant;
}
@@ -324,15 +324,16 @@ struct ao2_container *ast_media_get_media(struct ast_media_index *index)
/*! \brief Update an index with new format/variant information */
static int update_file_format_info(struct ast_media_index *index, const char *filename, const char *variant_str, struct ast_format *file_format)
{
- RAII_VAR(struct media_variant *, variant, find_variant(index, filename, variant_str), ao2_cleanup);
+ struct media_variant *variant;
+
+ variant = alloc_variant(index, filename, variant_str);
if (!variant) {
- variant = alloc_variant(index, filename, variant_str);
- if (!variant) {
- return -1;
- }
+ return -1;
}
ast_format_cap_append(variant->formats, file_format, 0);
+ ao2_ref(variant, -1);
+
return 0;
}
@@ -341,7 +342,8 @@ static int process_media_file(struct ast_media_index *index, const char *variant
{
struct ast_format *file_format;
const char *file_identifier = filename_stripped;
- RAII_VAR(struct ast_str *, file_id_str, NULL, ast_free);
+ char *file_id_str = NULL;
+ int res;
file_format = ast_get_format_for_file_ext(ext);
if (!file_format) {
@@ -351,19 +353,17 @@ static int process_media_file(struct ast_media_index *index, const char *variant
/* handle updating the file information */
if (subdir) {
- file_id_str = ast_str_create(64);
- if (!file_id_str) {
+ if (ast_asprintf(&file_id_str, "%s/%s", subdir, filename_stripped) == -1) {
return -1;
}
- ast_str_set(&file_id_str, 0, "%s/%s", subdir, filename_stripped);
- file_identifier = ast_str_buffer(file_id_str);
+ file_identifier = file_id_str;
}
- if (update_file_format_info(index, file_identifier, variant, file_format)) {
- return -1;
- }
- return 0;
+ res = update_file_format_info(index, file_identifier, variant, file_format);
+ ast_free(file_id_str);
+
+ return res;
}
/*!
@@ -443,20 +443,18 @@ static int process_description_file(struct ast_media_index *index,
} else {
/* if there's text in cumulative_description, archive it and start anew */
if (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) {
- RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup);
+ struct media_variant *variant;
- variant = find_variant(index, file_id_persist, variant_str);
+ variant = alloc_variant(index, file_id_persist, variant_str);
if (!variant) {
- variant = alloc_variant(index, file_id_persist, variant_str);
- if (!variant) {
- res = -1;
- break;
- }
+ res = -1;
+ break;
}
ast_string_field_set(variant, description, ast_str_buffer(cumulative_description));
ast_str_reset(cumulative_description);
+ ao2_ref(variant, -1);
}
ast_free(file_id_persist);
@@ -468,15 +466,12 @@ static int process_description_file(struct ast_media_index *index,
/* handle the last one */
if (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) {
- RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup);
-
- variant = find_variant(index, file_id_persist, variant_str);
- if (!variant) {
- variant = alloc_variant(index, file_id_persist, variant_str);
- }
+ struct media_variant *variant;
+ variant = alloc_variant(index, file_id_persist, variant_str);
if (variant) {
ast_string_field_set(variant, description, ast_str_buffer(cumulative_description));
+ ao2_ref(variant, -1);
} else {
res = -1;
}
diff --git a/main/sounds_index.c b/main/sounds_index.c
index c7f9f4dd9..c792c1bbd 100644
--- a/main/sounds_index.c
+++ b/main/sounds_index.c
@@ -285,13 +285,15 @@ static void sounds_cleanup(void)
static void format_update_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
- ast_sounds_reindex();
+ /* Reindexing during shutdown is pointless. */
+ if (!ast_shutting_down()) {
+ ast_sounds_reindex();
+ }
}
int ast_sounds_index_init(void)
{
int res = 0;
- sounds_index = NULL;
if (ast_sounds_reindex()) {
return -1;
}
@@ -328,6 +330,5 @@ int ast_sounds_index_init(void)
struct ast_media_index *ast_sounds_get_index(void)
{
- ao2_ref(sounds_index, +1);
- return sounds_index;
+ return ao2_bump(sounds_index);
}
diff --git a/main/translate.c b/main/translate.c
index 70e97f955..ce4745ce0 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -1307,7 +1307,7 @@ int ast_unregister_translator(struct ast_translator *t)
}
AST_RWLIST_TRAVERSE_SAFE_END;
- if (found) {
+ if (found && !ast_shutting_down()) {
matrix_rebuild(0);
}
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index e63e158c4..76cf528eb 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -1,8 +1,19 @@
/*
- * sip_cli_commands.c
+ * Asterisk -- An open source telephony toolkit.
*
- * Created on: Jan 25, 2013
- * Author: mjordan
+ * Copyright (C) 2013, Digium, Inc.
+ *
+ * Matt Jordan <mjordan@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
*/
#include "asterisk.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 04:32:37 +0000