Do proper bounds checking in formats (bug #1356)
[asterisk/asterisk.git] / formats / format_g729.c
index 5d4aeab..68dde21 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
 
-/* Some Ideas for this code came from makeg729e.c by Jeffery Chilton */
+/* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */
 
 /* Portions of the conversion code are by guido@sienanet.it */
 
@@ -37,20 +42,14 @@ struct ast_filestream {
           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 g729[20];                         /* Two Real G729 Frames */
-       int lasttimeout;
-       struct timeval last;
-       int adj;
-       struct ast_filestream *next;
 };
 
 
-static struct ast_filestream *glist = NULL;
-static pthread_mutex_t g729_lock = AST_MUTEX_INITIALIZER;
+static ast_mutex_t g729_lock = AST_MUTEX_INITIALIZER;
 static int glistcnt = 0;
 
 static char *name = "g729";
@@ -65,24 +64,20 @@ static struct ast_filestream *g729_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(&g729_lock)) {
+               if (ast_mutex_lock(&g729_lock)) {
                        ast_log(LOG_WARNING, "Unable to lock g729 list\n");
                        free(tmp);
                        return NULL;
                }
-               tmp->next = glist;
-               glist = tmp;
                tmp->fd = fd;
-               tmp->owner = NULL;
                tmp->fr.data = tmp->g729;
                tmp->fr.frametype = AST_FRAME_VOICE;
                tmp->fr.subclass = AST_FORMAT_G729A;
                /* datalen will vary for each frame */
                tmp->fr.src = name;
                tmp->fr.mallocd = 0;
-               tmp->lasttimeout = -1;
                glistcnt++;
-               ast_pthread_mutex_unlock(&g729_lock);
+               ast_mutex_unlock(&g729_lock);
                ast_update_use_count();
        }
        return tmp;
@@ -96,73 +91,38 @@ static struct ast_filestream *g729_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(&g729_lock)) {
+               if (ast_mutex_lock(&g729_lock)) {
                        ast_log(LOG_WARNING, "Unable to lock g729 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(&g729_lock);
+               ast_mutex_unlock(&g729_lock);
                ast_update_use_count();
        } else
                ast_log(LOG_WARNING, "Out of memory\n");
        return tmp;
 }
 
-static struct ast_frame *g729_read(struct ast_filestream *s)
-{
-       return NULL;
-}
-
 static void g729_close(struct ast_filestream *s)
 {
-       struct ast_filestream *tmp, *tmpl = NULL;
-       if (ast_pthread_mutex_lock(&g729_lock)) {
+       if (ast_mutex_lock(&g729_lock)) {
                ast_log(LOG_WARNING, "Unable to lock g729 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(&g729_lock);
+       ast_mutex_unlock(&g729_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);
        s = NULL;
 }
 
-static int ast_read_callback(void *data)
+static struct ast_frame *g729_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_G729A;
        s->fr.offset = AST_FRIENDLY_OFFSET;
@@ -173,57 +133,10 @@ static int ast_read_callback(void *data)
        if ((res = read(s->fd, s->g729, 20)) != 20) {
                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;
-       }
-       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 NULL;
        }
-       return retval;
-}
-
-static int g729_apply(struct ast_channel *c, struct ast_filestream *s)
-{
-       /* Select our owner for this stream, and get the ball rolling. */
-       s->owner = c;
-       return 0;
-}
-
-static int g729_play(struct ast_filestream *s)
-{
-       ast_read_callback(s);
-       return 0;
+       *whennext = s->fr.samples;
+       return &s->fr;
 }
 
 static int g729_write(struct ast_filestream *fs, struct ast_frame *f)
@@ -237,12 +150,12 @@ static int g729_write(struct ast_filestream *fs, struct ast_frame *f)
                ast_log(LOG_WARNING, "Asked to write non-G729 frame (%d)!\n", f->subclass);
                return -1;
        }
-       if (f->datalen % 20) {
-               ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 20\n", f->datalen);
+       if (f->datalen % 10) {
+               ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 10\n", f->datalen);
                return -1;
        }
        if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
-                       ast_log(LOG_WARNING, "Bad write (%d/20): %s\n", res, strerror(errno));
+                       ast_log(LOG_WARNING, "Bad write (%d/10): %s\n", res, strerror(errno));
                        return -1;
        }
        return 0;
@@ -256,19 +169,22 @@ static char *g729_getcomment(struct ast_filestream *s)
 static int g729_seek(struct ast_filestream *fs, long sample_offset, int whence)
 {
        long bytes;
-       off_t min,cur,max,offset;
+       off_t min,cur,max,offset=0;
        min = 0;
        cur = lseek(fs->fd, 0, SEEK_CUR);
        max = lseek(fs->fd, 0, SEEK_END);
        
        bytes = 20 * (sample_offset / 160);
-       if(whence == SEEK_SET)
+       if (whence == SEEK_SET)
                offset = bytes;
-       if(whence == SEEK_CUR)
+       else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
                offset = cur + bytes;
-       if(whence == SEEK_END)
+       else if (whence == SEEK_END)
                offset = max - bytes;
-       offset = (offset > max)?max:offset;
+       if (whence != SEEK_FORCECUR) {
+               offset = (offset > max)?max:offset;
+       }
+       // protect against seeking beyond begining.
        offset = (offset < min)?min:offset;
        if (lseek(fs->fd, offset, SEEK_SET) < 0)
                return -1;
@@ -295,8 +211,6 @@ int load_module()
        return ast_format_register(name, exts, AST_FORMAT_G729A,
                                                                g729_open,
                                                                g729_rewrite,
-                                                               g729_apply,
-                                                               g729_play,
                                                                g729_write,
                                                                g729_seek,
                                                                g729_trunc,
@@ -310,32 +224,18 @@ int load_module()
 
 int unload_module()
 {
-       struct ast_filestream *tmp, *tmpl;
-       if (ast_pthread_mutex_lock(&g729_lock)) {
-               ast_log(LOG_WARNING, "Unable to lock g729 list\n");
-               return -1;
-       }
-       tmp = glist;
-       while(tmp) {
-               if (tmp->owner)
-                       ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
-               tmpl = tmp;
-               tmp = tmp->next;
-               free(tmpl);
-       }
-       ast_pthread_mutex_unlock(&g729_lock);
        return ast_format_unregister(name);
 }      
 
 int usecount()
 {
        int res;
-       if (ast_pthread_mutex_lock(&g729_lock)) {
+       if (ast_mutex_lock(&g729_lock)) {
                ast_log(LOG_WARNING, "Unable to lock g729 list\n");
                return -1;
        }
        res = glistcnt;
-       ast_pthread_mutex_unlock(&g729_lock);
+       ast_mutex_unlock(&g729_lock);
        return res;
 }