[Asterisk-cvs] asterisk/channels chan_iax2.c,1.125,1.126 iax2-parser.c,1.17,1.18

[markster at lists.digium.com]

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

Modified Files:
	chan_iax2.c iax2-parser.c 
Log Message:
Make trunking and timestamps palce nicely


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- chan_iax2.c	22 Apr 2004 00:20:33 -0000	1.125
+++ chan_iax2.c	22 Apr 2004 18:51:42 -0000	1.126
@@ -4565,6 +4565,14 @@
 								f.src = "IAX2";
 								f.mallocd = 0;
 								f.offset = 0;
+								f.delivery.tv_sec = peer->rxtrunktime.tv_sec;
+								f.delivery.tv_usec = peer->rxtrunktime.tv_usec;
+								f.delivery.tv_sec += ts / 1000;
+								f.delivery.tv_usec += ts % 1000;
+								if (f.delivery.tv_usec >= 1000000) {
+									f.delivery.tv_usec -= 1000000;
+									f.delivery.tv_sec += 1;
+								}
 								if (f.datalen && (f.frametype == AST_FRAME_VOICE)) 
 									f.samples = get_samples(&f);
 								else

Index: iax2-parser.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- iax2-parser.c	18 Mar 2004 06:04:22 -0000	1.17
+++ iax2-parser.c	22 Apr 2004 18:51:42 -0000	1.18
@@ -570,6 +570,7 @@
 	fr->af.samples = f->samples;
 	fr->af.offset = AST_FRIENDLY_OFFSET;
 	fr->af.src = f->src;
+	fr->af.delivery = f->delivery;
 	fr->af.data = fr->afdata;
 	if (fr->af.datalen) 
 		memcpy(fr->af.data, f->data, fr->af.datalen);