diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-05-15 22:05:16 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-05-15 22:05:16 +0000 |
| commit | d2478e8f4ff36fb7c548d96868d8803913152e39 (patch) | |
| tree | 7c1429629abf0b9d59652ace76d067ef04c69f36 /channels | |
| parent | 0e3310447c61f28251ad538fe2346abd92f8f5fc (diff) | |
combine two lines of code to make the logic clearer (bug #4273)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5683 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_iax2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 36711b775..1b78bf732 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -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 */ |