combine two lines of code to make the logic clearer (bug #4273)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
882eea1390
commit
fb59e4a857
|
@ -6219,8 +6219,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
|
|||
else
|
||||
f.data = NULL;
|
||||
if(trunked_ts) {
|
||||
fr.ts = trunked_ts;
|
||||
fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (fr.ts & 0xffff);
|
||||
fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (trunked_ts & 0xffff);
|
||||
} else
|
||||
fr.ts = fix_peerts(&rxtrunktime, fr.callno, ts);
|
||||
/* Don't pass any packets until we're started */
|
||||
|
|
Loading…
Reference in New Issue