diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2005-05-19 12:51:58 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-05-19 12:51:58 +0000 |
| commit | 58a530eba8ff9e914d16bfcaa8ab92b0a835d334 (patch) | |
| tree | df8e2460a9b42e53ca946c78dfde6bf841e2877d /channels | |
| parent | 041147243cc295106016a4e36db79ccf168d742f (diff) | |
remove unnecessary conditional logic (bug #4313, take two)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 32fe93595..359d56ce8 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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) { |