Summary:ASTERISK-04173: Typo in recent CVS commit (chan_iax2.c rev 1.281)
Reporter:xrobau (xrobau)Labels:
Date Opened:2005-05-15 00:11:19Date Closed:2008-01-15 15:34:49.000-0600
Versions:Frequency of
Environment:Attachments:( 0) chan_iax2.tts.patch.txt
Description:Line 6215 and 6216 are:
fr.ts = trunked_ts;
fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (fr.ts & 0xffff);

The second line was added in 1.281, I assume the first was inadvertently not removed.

No patch, no disclamer required.
Comments:By: xrobau (xrobau) 2005-05-15 00:13:42

(Or possibly, the .. | (fr.ts & 0xffff) should be ... | (trunked_ts & 0xffff))

By: Michael Jerris (mikej) 2005-05-15 00:16:08

grolloj, stevek: Can you please review this.

By: grolloj (grolloj) 2005-05-15 17:40:38

The two lines work correctly as they're written. The 32-bit frame timestamp is constructed from the 16-bit trunk timestamp and the last calculated 32-bit timestamp for the channel. The frame timestamp is used later for scheduling with the jitter buffer.

I've provided a patch to make this one line. It's clearer and safer from future modifications. Thanks for pointing this out.

Disclaimer on file.

By: Kevin P. Fleming (kpfleming) 2005-05-15 17:59:50

Committed to CVS HEAD, thanks!

By: Digium Subversion (svnbot) 2008-01-15 15:34:49.000-0600

Repository: asterisk
Revision: 5683

U   trunk/channels/chan_iax2.c

r5683 | kpfleming | 2008-01-15 15:34:49 -0600 (Tue, 15 Jan 2008) | 2 lines

combine two lines of code to make the logic clearer (bug ASTERISK-4173)