kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lag in diverging clocks (bug #1696)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-30 22:22:49 +00:00
parent 89561c6a29
commit 514acf8dfc
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
channels/chan_iax2.c
View File

@@ -1109,21 +1109,14 @@ static int __do_deliver(void *data)
/* Just deliver the packet by using queueing. This is called by /* Just deliver the packet by using queueing. This is called by
the IAX thread with the iaxsl lock held. */ the IAX thread with the iaxsl lock held. */
struct iax_frame *fr = data; struct iax_frame *fr = data;
unsigned int ts;
fr->retrans = -1; fr->retrans = -1;
if (iaxs[fr->callno] && !iaxs[fr->callno]->alreadygone) { if (iaxs[fr->callno] && !iaxs[fr->callno]->alreadygone) {
if (fr->af.frametype == AST_FRAME_IAX) { if (fr->af.frametype == AST_FRAME_IAX &&
/* We have to treat some of these packets specially because fr->af.subclass == IAX_COMMAND_LAGRQ) {
they're LAG measurement packets */ /* send a lag response to a lag request that has
if (fr->af.subclass == IAX_COMMAND_LAGRQ) { * gone through our jitter buffer */
/* If we got a queued request, build a reply and send it */
fr->af.subclass = IAX_COMMAND_LAGRP; fr->af.subclass = IAX_COMMAND_LAGRP;
iax2_send(iaxs[fr->callno], &fr->af, fr->ts, -1, 0, 0, 0); iax2_send(iaxs[fr->callno], &fr->af, fr->ts, -1, 0, 0, 0);
} else if (fr->af.subclass == IAX_COMMAND_LAGRP) {
/* This is a reply we've been given, actually measure the difference */
ts = calc_timestamp(iaxs[fr->callno], 0, &fr->af);
iaxs[fr->callno]->lag = ts - fr->ts;
}
} else { } else {
iax2_queue_frame(fr->callno, &fr->af); iax2_queue_frame(fr->callno, &fr->af);
} }
@@ -5234,15 +5227,22 @@ retryowner2:
forward_command(iaxs[fr.callno], AST_FRAME_IAX, f.subclass, fr.ts, NULL, 0, -1); forward_command(iaxs[fr.callno], AST_FRAME_IAX, f.subclass, fr.ts, NULL, 0, -1);
} else { } else {
#endif #endif
/* A little strange -- We have to actually go through the motions of
delivering the packet. In the very last step, it will be properly
handled by do_deliver */
f.src = "LAGRQ"; f.src = "LAGRQ";
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
f.samples = 0; f.samples = 0;
iax_frame_wrap(&fr, &f); iax_frame_wrap(&fr, &f);
if(f.subclass == IAX_COMMAND_LAGRQ) {
/* A little strange -- We have to actually go through the motions of
delivering the packet. In the very last step, it will be properly
handled by do_deliver */
schedule_delivery(iaxfrdup2(&fr), 1, updatehistory); schedule_delivery(iaxfrdup2(&fr), 1, updatehistory);
} else {
unsigned int ts;
/* This is a reply we've been given, actually measure the difference */
ts = calc_timestamp(iaxs[fr.callno], 0, &fr.af);
iaxs[fr.callno]->lag = ts - fr.ts;
}
#ifdef BRIDGE_OPTIMIZATION #ifdef BRIDGE_OPTIMIZATION
} }
#endif #endif