Do proper bounds checking in formats (bug #1356)
[asterisk/asterisk.git] / formats / format_gsm.c
index 1ac9869..d58039e 100755 (executable)
@@ -17,6 +17,7 @@
 #include <asterisk/logger.h>
 #include <asterisk/sched.h>
 #include <asterisk/module.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
+#include "msgsm.h"
 
-/* Some Ideas for this code came from makegsme.c by Jeffery Chilton */
+/* Some Ideas for this code came from makegsme.c by Jeffrey Chilton */
 
 /* Portions of the conversion code are by guido@sienanet.it */
 
+/* silent gsm frame */
+/* begin binary data: */
+char gsm_silence[] = /* 33 */
+{0xD8,0x20,0xA2,0xE1,0x5A,0x50,0x00,0x49,0x24,0x92,0x49,0x24,0x50,0x00,0x49
+,0x24,0x92,0x49,0x24,0x50,0x00,0x49,0x24,0x92,0x49,0x24,0x50,0x00,0x49,0x24
+,0x92,0x49,0x24};
+/* end binary data. size = 33 bytes */
+
 struct ast_filestream {
        void *reserved[AST_RESERVED_POINTERS];
        /* Believe it or not, we must decode/recode to account for the
           weird MS format */
        /* This is what a filestream means to us */
        int fd; /* Descriptor */
-       struct ast_channel *owner;
        struct ast_frame fr;                            /* Frame information */
        char waste[AST_FRIENDLY_OFFSET];        /* Buffer for sending frames, etc */
        char empty;                                                     /* Empty character */
-       unsigned char gsm[33];                          /* Two Real GSM Frames */
-       int lasttimeout;
-       struct timeval last;
-       int adj;
-       struct ast_filestream *next;
+       unsigned char gsm[66];                          /* Two Real GSM Frames */
 };
 
 
-static struct ast_filestream *glist = NULL;
-static pthread_mutex_t gsm_lock = AST_MUTEX_INITIALIZER;
+static ast_mutex_t gsm_lock = AST_MUTEX_INITIALIZER;
 static int glistcnt = 0;
 
 static char *name = "gsm";
@@ -65,24 +73,20 @@ static struct ast_filestream *gsm_open(int fd)
        struct ast_filestream *tmp;
        if ((tmp = malloc(sizeof(struct ast_filestream)))) {
                memset(tmp, 0, sizeof(struct ast_filestream));
-               if (ast_pthread_mutex_lock(&gsm_lock)) {
+               if (ast_mutex_lock(&gsm_lock)) {
                        ast_log(LOG_WARNING, "Unable to lock gsm list\n");
                        free(tmp);
                        return NULL;
                }
-               tmp->next = glist;
-               glist = tmp;
                tmp->fd = fd;
-               tmp->owner = NULL;
                tmp->fr.data = tmp->gsm;
                tmp->fr.frametype = AST_FRAME_VOICE;
                tmp->fr.subclass = AST_FORMAT_GSM;
                /* datalen will vary for each frame */
                tmp->fr.src = name;
                tmp->fr.mallocd = 0;
-               tmp->lasttimeout = -1;
                glistcnt++;
-               ast_pthread_mutex_unlock(&gsm_lock);
+               ast_mutex_unlock(&gsm_lock);
                ast_update_use_count();
        }
        return tmp;
@@ -96,133 +100,56 @@ static struct ast_filestream *gsm_rewrite(int fd, char *comment)
        struct ast_filestream *tmp;
        if ((tmp = malloc(sizeof(struct ast_filestream)))) {
                memset(tmp, 0, sizeof(struct ast_filestream));
-               if (ast_pthread_mutex_lock(&gsm_lock)) {
+               if (ast_mutex_lock(&gsm_lock)) {
                        ast_log(LOG_WARNING, "Unable to lock gsm list\n");
                        free(tmp);
                        return NULL;
                }
-               tmp->next = glist;
-               glist = tmp;
                tmp->fd = fd;
-               tmp->owner = NULL;
-               tmp->lasttimeout = -1;
                glistcnt++;
-               ast_pthread_mutex_unlock(&gsm_lock);
+               ast_mutex_unlock(&gsm_lock);
                ast_update_use_count();
        } else
                ast_log(LOG_WARNING, "Out of memory\n");
        return tmp;
 }
 
-static struct ast_frame *gsm_read(struct ast_filestream *s)
-{
-       return NULL;
-}
-
 static void gsm_close(struct ast_filestream *s)
 {
-       struct ast_filestream *tmp, *tmpl = NULL;
-       if (ast_pthread_mutex_lock(&gsm_lock)) {
+       if (ast_mutex_lock(&gsm_lock)) {
                ast_log(LOG_WARNING, "Unable to lock gsm list\n");
                return;
        }
-       tmp = glist;
-       while(tmp) {
-               if (tmp == s) {
-                       if (tmpl)
-                               tmpl->next = tmp->next;
-                       else
-                               glist = tmp->next;
-                       break;
-               }
-               tmpl = tmp;
-               tmp = tmp->next;
-       }
        glistcnt--;
-       if (s->owner) {
-               s->owner->stream = NULL;
-               if (s->owner->streamid > -1)
-                       ast_sched_del(s->owner->sched, s->owner->streamid);
-               s->owner->streamid = -1;
-       }
-       ast_pthread_mutex_unlock(&gsm_lock);
+       ast_mutex_unlock(&gsm_lock);
        ast_update_use_count();
-       if (!tmp) 
-               ast_log(LOG_WARNING, "Freeing a filestream we don't seem to own\n");
        close(s->fd);
        free(s);
 }
 
-static int ast_read_callback(void *data)
+static struct ast_frame *gsm_read(struct ast_filestream *s, int *whennext)
 {
-       int retval = 0;
        int res;
-       int delay = 20;
-       struct ast_filestream *s = data;
-       struct timeval tv;
-       /* Send a frame from the file to the appropriate channel */
-
        s->fr.frametype = AST_FRAME_VOICE;
        s->fr.subclass = AST_FORMAT_GSM;
        s->fr.offset = AST_FRIENDLY_OFFSET;
-       s->fr.timelen = 20;
+       s->fr.samples = 160;
        s->fr.datalen = 33;
        s->fr.mallocd = 0;
        s->fr.data = s->gsm;
        if ((res = read(s->fd, s->gsm, 33)) != 33) {
                if (res)
                        ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-               s->owner->streamid = -1;
-               return 0;
-       }
-       /* Lastly, process the frame */
-       if (ast_write(s->owner, &s->fr)) {
-               ast_log(LOG_WARNING, "Failed to write frame\n");
-               s->owner->streamid = -1;
-               return 0;
+               return NULL;
        }
-       if (s->last.tv_usec || s->last.tv_usec) {
-               int ms;
-               gettimeofday(&tv, NULL);
-               ms = 1000 * (tv.tv_sec - s->last.tv_sec) + 
-                       (tv.tv_usec - s->last.tv_usec) / 1000;
-               s->last.tv_sec = tv.tv_sec;
-               s->last.tv_usec = tv.tv_usec;
-               if ((ms - delay) * (ms - delay) > 4) {
-                       /* Compensate if we're more than 2 ms off */
-                       s->adj -= (ms - delay);
-               }
-#if 0
-               fprintf(stdout, "Delay is %d, adjustment is %d, last was %d\n", delay, s->adj, ms);
-#endif
-               delay += s->adj;
-               if (delay < 1)
-                       delay = 1;
-       } else
-               gettimeofday(&s->last, NULL);
-       if (s->lasttimeout != delay) {
-               /* We'll install the next timeout now. */
-               s->owner->streamid = ast_sched_add(s->owner->sched,
-                               delay, ast_read_callback, s); 
-               s->lasttimeout = delay;
-       } else {
-               /* Just come back again at the same time */
-               retval = -1;
-       }
-       return retval;
-}
-
-static int gsm_apply(struct ast_channel *c, struct ast_filestream *s)
-{
-       /* Select our owner for this stream, and get the ball rolling. */
-       s->owner = c;
-       ast_read_callback(s);
-       return 0;
+       *whennext = 160;
+       return &s->fr;
 }
 
 static int gsm_write(struct ast_filestream *fs, struct ast_frame *f)
 {
        int res;
+       unsigned char gsm[66];
        if (f->frametype != AST_FRAME_VOICE) {
                ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
                return -1;
@@ -231,17 +158,71 @@ static int gsm_write(struct ast_filestream *fs, struct ast_frame *f)
                ast_log(LOG_WARNING, "Asked to write non-GSM frame (%d)!\n", f->subclass);
                return -1;
        }
-       if (f->datalen % 33) {
-               ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 33\n", f->datalen);
-               return -1;
-       }
-       if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-                       ast_log(LOG_WARNING, "Bad write (%d/33): %s\n", res, strerror(errno));
+       if (!(f->datalen % 65)) {
+               /* This is in MSGSM format, need to be converted */
+               int len=0;
+               while(len < f->datalen) {
+                       conv65(f->data + len, gsm);
+                       if ((res = write(fs->fd, gsm, 66)) != 66) {
+                               ast_log(LOG_WARNING, "Bad write (%d/66): %s\n", res, strerror(errno));
+                               return -1;
+                       }
+                       len += 65;
+               }
+       } else {
+               if (f->datalen % 33) {
+                       ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 33\n", f->datalen);
                        return -1;
+               }
+               if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
+                               ast_log(LOG_WARNING, "Bad write (%d/33): %s\n", res, strerror(errno));
+                               return -1;
+               }
        }
        return 0;
 }
 
+static int gsm_seek(struct ast_filestream *fs, long sample_offset, int whence)
+{
+       off_t offset=0,min,cur,max,distance;
+       
+       min = 0;
+       cur = lseek(fs->fd, 0, SEEK_CUR);
+       max = lseek(fs->fd, 0, SEEK_END);
+       /* have to fudge to frame here, so not fully to sample */
+       distance = (sample_offset/160) * 33;
+       if(whence == SEEK_SET)
+               offset = distance;
+       else if(whence == SEEK_CUR || whence == SEEK_FORCECUR)
+               offset = distance + cur;
+       else if(whence == SEEK_END)
+               offset = max - distance;
+       // Always protect against seeking past the begining.
+       offset = (offset < min)?min:offset;
+       if (whence != SEEK_FORCECUR) {
+               offset = (offset > max)?max:offset;
+       } else if (offset > max) {
+               int i;
+               lseek(fs->fd, 0, SEEK_END);
+               for (i=0; i< (offset - max) / 33; i++) {
+                       write(fs->fd, gsm_silence, 33);
+               }
+       }
+       return lseek(fs->fd, offset, SEEK_SET);
+}
+
+static int gsm_trunc(struct ast_filestream *fs)
+{
+       return ftruncate(fs->fd, lseek(fs->fd,0,SEEK_CUR));
+}
+
+static long gsm_tell(struct ast_filestream *fs)
+{
+       off_t offset;
+       offset = lseek(fs->fd, 0, SEEK_CUR);
+       return (offset/33)*160;
+}
+
 static char *gsm_getcomment(struct ast_filestream *s)
 {
        return NULL;
@@ -252,8 +233,10 @@ int load_module()
        return ast_format_register(name, exts, AST_FORMAT_GSM,
                                                                gsm_open,
                                                                gsm_rewrite,
-                                                               gsm_apply,
                                                                gsm_write,
+                                                               gsm_seek,
+                                                               gsm_trunc,
+                                                               gsm_tell,
                                                                gsm_read,
                                                                gsm_close,
                                                                gsm_getcomment);
@@ -263,32 +246,18 @@ int load_module()
 
 int unload_module()
 {
-       struct ast_filestream *tmp, *tmpl;
-       if (ast_pthread_mutex_lock(&gsm_lock)) {
-               ast_log(LOG_WARNING, "Unable to lock gsm list\n");
-               return -1;
-       }
-       tmp = glist;
-       while(tmp) {
-               if (tmp->owner)
-                       ast_softhangup(tmp->owner);
-               tmpl = tmp;
-               tmp = tmp->next;
-               free(tmpl);
-       }
-       ast_pthread_mutex_unlock(&gsm_lock);
        return ast_format_unregister(name);
 }      
 
 int usecount()
 {
        int res;
-       if (ast_pthread_mutex_lock(&gsm_lock)) {
+       if (ast_mutex_lock(&gsm_lock)) {
                ast_log(LOG_WARNING, "Unable to lock gsm list\n");
                return -1;
        }
        res = glistcnt;
-       ast_pthread_mutex_unlock(&gsm_lock);
+       ast_mutex_unlock(&gsm_lock);
        return res;
 }