aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/channel.c3
-rw-r--r--main/pbx.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index c518e4143..c93d6ade9 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -710,6 +710,9 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_
(long) time(NULL), ast_atomic_fetchadd_int(&uniqueint, 1));
}
+ tmp->cid.cid_name = ast_strdup(cid_name);
+ tmp->cid.cid_num = ast_strdup(cid_num);
+
if (!ast_strlen_zero(name_fmt)) {
/* Almost every channel is calling this function, and setting the name via the ast_string_field_build() call.
* And they all use slightly different formats for their name string.
diff --git a/main/pbx.c b/main/pbx.c
index 5f3f77b16..edb3d1ba7 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -515,7 +515,7 @@ int pbx_exec(struct ast_channel *c, /*!< Channel */
const char *saved_c_appl;
const char *saved_c_data;
- if (c->cdr)
+ if (c->cdr && !(c->exten[0] == 'h' && c->exten[1] == 0) )
ast_cdr_setapp(c->cdr, app->name, data);
/* save channel values */