diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-10-10 20:27:54 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-10-10 20:27:54 +0000 |
| commit | b4389ceaea91105fa336d9f63c6530c773414857 (patch) | |
| tree | abe989db5bf10a6ec2f6f5c349cbc0d872ea84a5 /channels/chan_iax2.c | |
| parent | f7639471e66200db474dc3fe1051681fa61599cb (diff) | |
Keep back delivery times on trunk (bug #2587)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3974 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rwxr-xr-x | channels/chan_iax2.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index f309d4a45..49d1ca27f 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1729,7 +1729,7 @@ static void unwrap_timestamp(struct iax_frame *fr) } } -static int schedule_delivery(struct iax_frame *fr, int reallydeliver, int updatehistory) +static int schedule_delivery(struct iax_frame *fr, int reallydeliver, int updatehistory, int fromtrunk) { int ms,x; int delay; @@ -1792,7 +1792,7 @@ static int schedule_delivery(struct iax_frame *fr, int reallydeliver, int update ms = 0; /* delivery time is sender's sent timestamp converted back into absolute time according to our clock */ - if (iaxs[fr->callno]->rxcore.tv_sec || iaxs[fr->callno]->rxcore.tv_usec) { + if ( (!fromtrunk) && (iaxs[fr->callno]->rxcore.tv_sec || iaxs[fr->callno]->rxcore.tv_usec) ) { fr->af.delivery.tv_sec = iaxs[fr->callno]->rxcore.tv_sec; fr->af.delivery.tv_usec = iaxs[fr->callno]->rxcore.tv_usec; fr->af.delivery.tv_sec += fr->ts / 1000; @@ -1805,7 +1805,7 @@ static int schedule_delivery(struct iax_frame *fr, int reallydeliver, int update else { #if 0 if (reallydeliver) - ast_log(LOG_DEBUG, "schedule_delivery: set delivery to 0 as we don't have an rxcore yet.\n"); + ast_log(LOG_DEBUG, "schedule_delivery: set delivery to 0 as we don't have an rxcore yet, or frame is from trunk.\n"); #endif fr->af.delivery.tv_sec = 0; fr->af.delivery.tv_usec = 0; @@ -1886,7 +1886,8 @@ static int schedule_delivery(struct iax_frame *fr, int reallydeliver, int update delay = maxjitterbuffer; /* If jitter buffer is disabled then just pretend the frame is "right on time" */ - if (!iaxs[fr->callno]->usejitterbuf) + /* If frame came from trunk, also don't do any delay */ + if ( (!iaxs[fr->callno]->usejitterbuf) || fromtrunk ) delay = 0; if (option_debug) { @@ -5090,10 +5091,10 @@ static int socket_read(int *id, int fd, short events, void *cbdata) if (iaxs[fr.callno]->bridgecallno) { forward_delivery(&fr); } else { - schedule_delivery(iaxfrdup2(&fr), 1, updatehistory); + schedule_delivery(iaxfrdup2(&fr), 1, updatehistory, 1); } #else - schedule_delivery(iaxfrdup2(&fr), 1, updatehistory); + schedule_delivery(iaxfrdup2(&fr), 1, updatehistory, 1); #endif } } else { @@ -5346,7 +5347,7 @@ retryowner: if (option_debug) ast_log(LOG_DEBUG, "IAX subclass %d received\n", f.subclass); /* Go through the motions of delivering the packet without actually doing so */ - schedule_delivery(&fr, 0, updatehistory); + schedule_delivery(&fr, 0, updatehistory, 0); switch(f.subclass) { case IAX_COMMAND_ACK: /* Do nothing */ @@ -6004,12 +6005,12 @@ retryowner2: forward_delivery(&fr); } else { duped_fr = iaxfrdup2(&fr); - schedule_delivery(duped_fr, 1, updatehistory); + schedule_delivery(duped_fr, 1, updatehistory, 0); fr.ts = duped_fr->ts; } #else duped_fr = iaxfrdup2(&fr); - schedule_delivery(duped_fr, 1, updatehistory); + schedule_delivery(duped_fr, 1, updatehistory, 0); fr.ts = duped_fr->ts; #endif |