combine two lines of code to make the logic clearer (bug #4273)
authorKevin P. Fleming <kpfleming@digium.com>
Sun, 15 May 2005 22:05:16 +0000 (22:05 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sun, 15 May 2005 22:05:16 +0000 (22:05 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5683 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index 36711b7..1b78bf7 100755 (executable)
@@ -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 */