Make trunking and timestamps palce nicely

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bdf83c6acf0f864210621d380b1da5072426cd36..fee41ac16370d85d0a7bcc7ad1f646a51bef11b1 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4565,6 +4565,14 @@ 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

diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index 9d31a8be91dec78051d5d5c049ca4c9d2359f560..d8d58d60c0ceef05b78546c0ec53c82d3ad9e563 100755 (executable)
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -570,6 +570,7 @@ 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.data = fr->afdata;
        if (fr->af.datalen) 
                memcpy(fr->af.data, f->data, fr->af.datalen);