From: Tilghman Lesher Date: Mon, 3 Nov 2008 21:57:14 +0000 (+0000) Subject: Merged revisions 154060 via svnmerge from X-Git-Tag: 1.6.2.0-beta1~961 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd6ee6e1f2b206c35e7458b73e9773492673f78f;p=thirdparty%2Fasterisk.git Merged revisions 154060 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r154060 | tilghman | 2008-11-03 15:48:21 -0600 (Mon, 03 Nov 2008) | 3 lines Remove the potential for a division by zero error. (Closes issue #13810) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@154061 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/rtp.c b/main/rtp.c index 82610484a7..33ea83da59 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -68,8 +68,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static int dtmftimeout = DEFAULT_DTMF_TIMEOUT; -static int rtpstart; /*!< First port for RTP sessions (set in rtp.conf) */ -static int rtpend; /*!< Last port for RTP sessions (set in rtp.conf) */ +static int rtpstart = 5000; /*!< First port for RTP sessions (set in rtp.conf) */ +static int rtpend = 31000; /*!< Last port for RTP sessions (set in rtp.conf) */ static int rtpdebug; /*!< Are we debugging? */ static int rtcpdebug; /*!< Are we debugging RTCP? */ static int rtcpstats; /*!< Are we debugging RTCP? */ @@ -2457,7 +2457,7 @@ struct ast_rtp *ast_rtp_new_with_bindaddr(struct sched_context *sched, struct io * next one, cannot be enforced in presence of a NAT box because the * mapping is not under our control. */ - x = (ast_random() % (rtpend-rtpstart)) + rtpstart; + x = (rtpend == rtpstart) ? rtpstart : (ast_random() % (rtpend - rtpstart)) + rtpstart; x = x & ~1; /* make it an even number */ startplace = x; /* remember the starting point */ /* this is constant across the loop */