kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 62689 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@62690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-05-02 17:24:03 +00:00
parent 3d409eb793
commit fe7068a51b
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/channel.c
View File

@@ -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.

2
main/pbx.c
View File

@@ -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 */