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

Make sure calculation of time is always > 0...

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-03-25 07:17:33 +00:00
parent 3ec7218ffb
commit 638684636c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_iax2.c
View File

@@ -2578,7 +2578,7 @@ static unsigned int fix_peerts(struct iax2_peer *peer, int callno, unsigned int
static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, struct timeval *delivery)
{
struct timeval tv;
unsigned int ms;
int ms;
if (!p->offset.tv_sec && !p->offset.tv_usec) {
gettimeofday(&p->offset, NULL);
/* Round to nearest 20ms */
@@ -2592,6 +2592,8 @@ static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, str
} else {
gettimeofday(&tv, NULL);
ms = (tv.tv_sec - p->offset.tv_sec) * 1000 + (tv.tv_usec - p->offset.tv_usec) / 1000;
if (ms < 0)
ms = 0;
}
/* We never send the same timestamp twice, so fudge a little if we must */
if (ms <= p->lastsent) {
@@ -2632,7 +2634,7 @@ static unsigned int calc_rxstamp(struct chan_iax2_pvt *p)
{
/* Returns where in "receive time" we are */
struct timeval tv;
unsigned int ms;
int ms;
/* Setup rxcore if necessary */
if (!p->rxcore.tv_sec && !p->rxcore.tv_usec)
gettimeofday(&p->rxcore, NULL);