kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-08 05:02:32 +00:00
parent 6f41dcb8a3
commit 0b7de19b00
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
channels/chan_local.c
View File

@@ -515,7 +515,7 @@ static struct local_pvt *local_alloc(char *data, int format)
static struct ast_channel *local_new(struct local_pvt *p, int state)
{
struct ast_channel *tmp, *tmp2;
int randnum = rand() & 0xffff;
int randnum = rand() & 0xffff, fmt = 0;
tmp = ast_channel_alloc(1);
tmp2 = ast_channel_alloc(1);
@@ -537,14 +537,15 @@ static struct ast_channel *local_new(struct local_pvt *p, int state)
tmp2->type = type;
ast_setstate(tmp, state);
ast_setstate(tmp2, AST_STATE_RING);
tmp->writeformat = p->reqformat;
tmp2->writeformat = p->reqformat;
tmp->rawwriteformat = p->reqformat;
tmp2->rawwriteformat = p->reqformat;
tmp->readformat = p->reqformat;
tmp2->readformat = p->reqformat;
tmp->rawreadformat = p->reqformat;
tmp2->rawreadformat = p->reqformat;
fmt = ast_best_codec(p->reqformat);
tmp->writeformat = fmt;
tmp2->writeformat = fmt;
tmp->rawwriteformat = fmt;
tmp2->rawwriteformat = fmt;
tmp->readformat = fmt;
tmp2->readformat = fmt;
tmp->rawreadformat = fmt;
tmp2->rawreadformat = fmt;
tmp->tech_pvt = p;
tmp2->tech_pvt = p;
p->owner = tmp;