From 01424f1f0572e63629ee762f2bb23a7281e509ea Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Sun, 15 May 2005 00:07:42 +0000 Subject: [PATCH] Fix one way audio problem with iax trunking (bug #4221) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5656 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 61e6c3a45c..1cf3d58500 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6187,9 +6187,10 @@ static int socket_read(int *id, int fd, short events, void *cbdata) f.data = ptr; else f.data = NULL; - if(trunked_ts) + if(trunked_ts) { fr.ts = trunked_ts; - else + fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (fr.ts & 0xffff); + } else fr.ts = fix_peerts(&rxtrunktime, fr.callno, ts); /* Don't pass any packets until we're started */ if ((iaxs[fr.callno]->state & IAX_STATE_STARTED)) { @@ -6207,11 +6208,22 @@ 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, 1); + duped_fr = iaxfrdup2(&fr); + schedule_delivery(duped_fr, 1, updatehistory, 1); + fr.ts = duped_fr->ts; } #else - schedule_delivery(iaxfrdup2(&fr), 1, updatehistory, 1); + duped_fr = iaxfrdup2(&fr); + schedule_delivery(duped_fr, 1, updatehistory, 1); + fr.ts = duped_fr->ts; #endif + if (iaxs[fr.callno]->last < fr.ts) { + iaxs[fr.callno]->last = fr.ts; +#if 1 + if (option_debug) + ast_log(LOG_DEBUG, "For call=%d, set last=%d\n", fr.callno, fr.ts); +#endif + } } } else { ast_log(LOG_WARNING, "Datalen < 0?\n");