[Asterisk-cvs] asterisk/channels chan_iax2.c,1.91.2.13,1.91.2.14

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv9079/channels

Modified Files:
      Tag: v1-0_stable
	chan_iax2.c 
Log Message:
Fix timestamps on pings, etc (bug #1699)


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.91.2.13
retrieving revision 1.91.2.14
diff -u -d -r1.91.2.13 -r1.91.2.14
--- chan_iax2.c	21 May 2004 15:52:18 -0000	1.91.2.13
+++ chan_iax2.c	24 May 2004 03:14:37 -0000	1.91.2.14
@@ -873,7 +873,7 @@
 				iax2_send(iaxs[fr->callno], &fr->af, fr->ts, -1, 0, 0, 0);
 			} else if (fr->af.subclass == IAX_COMMAND_LAGRP) {
 				/* This is a reply we've been given, actually measure the difference */
-				ts = calc_timestamp(iaxs[fr->callno], 0, NULL);
+				ts = calc_timestamp(iaxs[fr->callno], 0, &fr->af);
 				iaxs[fr->callno]->lag = ts - fr->ts;
 			}
 		} else {
@@ -4687,11 +4687,11 @@
 					forward_command(iaxs[fr.callno], AST_FRAME_IAX, IAX_COMMAND_PONG, fr.ts, NULL, 0, -1);
 				} else {
 					/* Calculate ping time */
-					iaxs[fr.callno]->pingtime =  calc_timestamp(iaxs[fr.callno], 0, NULL) - fr.ts;
+					iaxs[fr.callno]->pingtime =  calc_timestamp(iaxs[fr.callno], 0, &f) - fr.ts;
 				}
 #else
 				/* Calculate ping time */
-				iaxs[fr.callno]->pingtime =  calc_timestamp(iaxs[fr.callno], 0) - fr.ts;
+				iaxs[fr.callno]->pingtime =  calc_timestamp(iaxs[fr.callno], 0, &f) - fr.ts;
 #endif
 				if (iaxs[fr.callno]->peerpoke) {
 					peer = iaxs[fr.callno]->peerpoke;