sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unnecessary conditional logic (bug #4313, take two) 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming 2005-05-19 12:51:58 +00:00
parent 041147243c
commit 58a530eba8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_sip.c
View File

@ -1546,12 +1546,9 @@ static int create_addr(struct sip_pvt *r, char *opeer)
else
r->noncodeccapability &= ~AST_RTP_DTMF;
ast_copy_string(r->context, p->context,sizeof(r->context));
if (!p->rtptimeout)
r->rtptimeout = p->rtptimeout;
if (!p->rtpholdtimeout)
r->rtpholdtimeout = p->rtpholdtimeout;
if (!p->rtpkeepalive)
r->rtpkeepalive = p->rtpkeepalive;
r->rtptimeout = p->rtptimeout;
r->rtpholdtimeout = p->rtpholdtimeout;
r->rtpkeepalive = p->rtpkeepalive;
if ((p->addr.sin_addr.s_addr || p->defaddr.sin_addr.s_addr) &&
(!p->maxms || ((p->lastms >= 0) && (p->lastms <= p->maxms)))) {
if (p->addr.sin_addr.s_addr) {