diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 17:24:03 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 17:24:03 +0000 |
| commit | 1de5da674f0d26af33de9f2eaf6d9c012d22ea73 (patch) | |
| tree | b0bec7068847eb3fa1e8a42df3835ad07d197f48 /main | |
| parent | 597a4c356a13203e414d28ab3fd4c6a0fbee83b7 (diff) | |
Merged revisions 62689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r62689 | murf | 2007-05-02 11:10:50 -0600 (Wed, 02 May 2007) | 1 line
a)In chan_zap, set the clid, src fields in channel_alloc call. b)in the channel_alloc func, set the cid_num and name fields from the arglist[blush]. c) don't update the channel app & app data fields if you are in the 'h' extension. d)the load_module func in cdr_radius needs to return DECLINE, SUCCESS.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@62690 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 3 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
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 */ |