Oops that wasn't quite right. Partially revert changes until real data is collected.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2749 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

@@ -4565,14 +4565,6 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
 								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

channels/iax2-parser.c

@@ -570,7 +570,8 @@ void iax_frame_wrap(struct iax_frame *fr, struct ast_frame *f)
 	fr->af.samples = f->samples;
 	fr->af.offset = AST_FRIENDLY_OFFSET;
 	fr->af.src = f->src;
-	fr->af.delivery = f->delivery;
+	fr->af.delivery.tv_sec = 0;
+	fr->af.delivery.tv_usec = 0;
 	fr->af.data = fr->afdata;
 	if (fr->af.datalen) 
 		memcpy(fr->af.data, f->data, fr->af.datalen);