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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5735 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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) {