diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 17:10:50 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 17:10:50 +0000 |
| commit | 64c47fc59d08227e402cd2177d8ea8a23064f289 (patch) | |
| tree | 8fef696a254988ddb7ce5e5ba9414a130635b739 /main | |
| parent | 47d7b5c6e6f748cdf9696b5441d4c18baf3b5d4a (diff) | |
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/branches/1.4@62689 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 37d3b6988..44dfd2ded 100644 --- a/main/channel.c +++ b/main/channel.c @@ -800,6 +800,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 5a9d768d4..22c67f4c4 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -516,7 +516,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 */ |