Don't do reinvite if both parties talk diffrent codecs
[asterisk/asterisk.git] / channels / chan_oss.c
index 0eb9bab..3557ac0 100755 (executable)
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef __linux
 #include <linux/soundcard.h>
+#elif defined(__FreeBSD__)
+#include <machine/soundcard.h>
+#else
+#include <soundcard.h>
+#endif
 #include "busy.h"
 #include "ringtone.h"
 #include "ring10.h"
 #include "answer.h"
 
 /* Which device to use */
+#ifdef __OpenBSD__
+#define DEV_DSP "/dev/audio"
+#else
 #define DEV_DSP "/dev/dsp"
+#endif
 
 /* Lets use 160 sample frames, just like GSM.  */
 #define FRAME_SIZE 160
@@ -60,7 +70,7 @@ static int silencesuppression = 0;
 static int silencethreshold = 1000;
 
 
-static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
+static ast_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
 
 static char *type = "Console";
 static char *desc = "OSS Console Channel Driver";
@@ -71,7 +81,7 @@ static char context[AST_MAX_EXTENSION] = "default";
 static char language[MAX_LANGUAGE] = "";
 static char exten[AST_MAX_EXTENSION] = "s";
 
-int hookstate=0;
+static int hookstate=0;
 
 static short silence[FRAME_SIZE] = {0, };
 
@@ -103,7 +113,7 @@ static struct chan_oss_pvt {
        char context[AST_MAX_EXTENSION];
 } oss;
 
-static int time_has_passed()
+static int time_has_passed(void)
 {
        struct timeval tv;
        int ms;
@@ -119,7 +129,7 @@ static int time_has_passed()
    with 160 sample frames, and a buffer size of 3, we have a 60ms buffer, 
    usually plenty. */
 
-pthread_t sthread;
+static pthread_t sthread;
 
 #define MAX_BUFFER_SIZE 100
 static int buffersize = 3;
@@ -134,6 +144,7 @@ static int sounddev = -1;
 
 static int autoanswer = 1;
  
+#if 0
 static int calc_loudness(short *frame)
 {
        int sum = 0;
@@ -147,6 +158,7 @@ static int calc_loudness(short *frame)
        sum = sum/FRAME_SIZE;
        return sum;
 }
+#endif
 
 static int cursound = -1;
 static int sampsent = 0;
@@ -206,7 +218,8 @@ static int send_sound(void)
                                }
                        }
                }
-               res = write(sounddev, frame, res * 2);
+               if (frame)
+                       res = write(sounddev, frame, res * 2);
                if (res > 0)
                        return 0;
                return res;
@@ -220,17 +233,25 @@ static void *sound_thread(void *unused)
        fd_set wfds;
        int max;
        int res;
+       char ign[4096];
+       if (read(sounddev, ign, sizeof(sounddev)) < 0)
+               ast_log(LOG_WARNING, "Read error on sound device: %s\n", strerror(errno));
        for(;;) {
                FD_ZERO(&rfds);
                FD_ZERO(&wfds);
                max = sndcmd[0];
                FD_SET(sndcmd[0], &rfds);
+               if (!oss.owner) {
+                       FD_SET(sounddev, &rfds);
+                       if (sounddev > max)
+                               max = sounddev;
+               }
                if (cursound > -1) {
                        FD_SET(sounddev, &wfds);
                        if (sounddev > max)
                                max = sounddev;
                }
-               res = select(max + 1, &rfds, &wfds, NULL, NULL);
+               res = ast_select(max + 1, &rfds, &wfds, NULL, NULL);
                if (res < 1) {
                        ast_log(LOG_WARNING, "select failed: %s\n", strerror(errno));
                        continue;
@@ -241,6 +262,11 @@ static void *sound_thread(void *unused)
                        offset = 0;
                        sampsent = 0;
                }
+               if (FD_ISSET(sounddev, &rfds)) {
+                       /* Ignore read */
+                       if (read(sounddev, ign, sizeof(ign)) < 0)
+                               ast_log(LOG_WARNING, "Read error on sound device: %s\n", strerror(errno));
+               }
                if (FD_ISSET(sounddev, &wfds))
                        if (send_sound())
                                ast_log(LOG_WARNING, "Failed to write sound\n");
@@ -395,7 +421,7 @@ static int soundcard_setinput(int force)
        return 1;
 }
 
-static int soundcard_init()
+static int soundcard_init(void)
 {
        /* Assume it's full duplex for starters */
        int fd = open(DEV_DSP,  O_RDWR | O_NONBLOCK);
@@ -434,6 +460,7 @@ static int oss_call(struct ast_channel *c, char *dest, int timeout)
                f.subclass = AST_CONTROL_ANSWER;
                ast_queue_frame(c, &f, 0);
        } else {
+               nosound = 1;
                ast_verbose( " << Type 'answer' to answer, or use 'autoanswer' for future calls >> \n");
                f.frametype = AST_FRAME_CONTROL;
                f.subclass = AST_CONTROL_RINGING;
@@ -456,8 +483,9 @@ static int oss_answer(struct ast_channel *c)
 {
        ast_verbose( " << Console call has been answered >> \n");
        answer_sound();
-       c->state = AST_STATE_UP;
+       ast_setstate(c, AST_STATE_UP);
        cursound = -1;
+       nosound=0;
        return 0;
 }
 
@@ -468,9 +496,9 @@ static int oss_hangup(struct ast_channel *c)
        c->pvt->pvt = NULL;
        oss.owner = NULL;
        ast_verbose( " << Hangup on console >> \n");
-       ast_pthread_mutex_lock(&usecnt_lock);
+       ast_mutex_lock(&usecnt_lock);
        usecnt--;
-       ast_pthread_mutex_unlock(&usecnt_lock);
+       ast_mutex_unlock(&usecnt_lock);
        if (hookstate) {
                if (autoanswer) {
                        /* Assume auto-hangup too */
@@ -581,7 +609,7 @@ static struct ast_frame *oss_read(struct ast_channel *chan)
                
        f.frametype = AST_FRAME_NULL;
        f.subclass = 0;
-       f.timelen = 0;
+       f.samples = 0;
        f.datalen = 0;
        f.data = NULL;
        f.offset = 0;
@@ -610,13 +638,13 @@ static struct ast_frame *oss_read(struct ast_channel *chan)
        if (readpos >= FRAME_SIZE * 2) {
                /* A real frame */
                readpos = 0;
-               if (chan->state != AST_STATE_UP) {
+               if (chan->_state != AST_STATE_UP) {
                        /* Don't transmit unless it's up */
                        return &f;
                }
                f.frametype = AST_FRAME_VOICE;
                f.subclass = AST_FORMAT_SLINEAR;
-               f.timelen = FRAME_SIZE / 8;
+               f.samples = FRAME_SIZE;
                f.datalen = FRAME_SIZE * 2;
                f.data = buf + AST_FRIENDLY_OFFSET;
                f.offset = AST_FRIENDLY_OFFSET;
@@ -689,10 +717,10 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *p, int state)
                if (strlen(language))
                        strncpy(tmp->language, language, sizeof(tmp->language)-1);
                p->owner = tmp;
-               tmp->state = state;
-               ast_pthread_mutex_lock(&usecnt_lock);
+               ast_setstate(tmp, state);
+               ast_mutex_lock(&usecnt_lock);
                usecnt++;
-               ast_pthread_mutex_unlock(&usecnt_lock);
+               ast_mutex_unlock(&usecnt_lock);
                ast_update_use_count();
                if (state != AST_STATE_DOWN) {
                        if (ast_pbx_start(tmp)) {
@@ -789,10 +817,10 @@ static char sendtext_usage[] =
 
 static int console_sendtext(int fd, int argc, char *argv[])
 {
-       int tmparg = 1;
+       int tmparg = 2;
        char text2send[256];
        struct ast_frame f = { 0, };
-       if (argc < 1)
+       if (argc < 2)
                return RESULT_SHOWUSAGE;
        if (!oss.owner) {
                ast_cli(fd, "No one is calling us\n");
@@ -801,7 +829,7 @@ static int console_sendtext(int fd, int argc, char *argv[])
        if (strlen(text2send))
                ast_cli(fd, "Warning: message already waiting to be sent, overwriting\n");
        strcpy(text2send, "");
-       while(tmparg <= argc) {
+       while(tmparg < argc) {
                strncat(text2send, argv[tmparg++], sizeof(text2send) - strlen(text2send));
                strncat(text2send, " ", sizeof(text2send) - strlen(text2send));
        }
@@ -863,9 +891,11 @@ static int console_dial(int fd, int argc, char *argv[])
        mye = exten;
        myc = context;
        if (argc == 2) {
+               char *stringp=NULL;
                strncpy(tmp, argv[1], sizeof(tmp)-1);
-               strtok(tmp, "@");
-               tmp2 = strtok(NULL, "@");
+               stringp=tmp;
+               strsep(&stringp, "@");
+               tmp2 = strsep(&stringp, "@");
                if (strlen(tmp))
                        mye = tmp;
                if (tmp2 && strlen(tmp2))
@@ -875,7 +905,7 @@ static int console_dial(int fd, int argc, char *argv[])
                strncpy(oss.exten, mye, sizeof(oss.exten)-1);
                strncpy(oss.context, myc, sizeof(oss.context)-1);
                hookstate = 1;
-               oss_new(&oss, AST_STATE_UP);
+               oss_new(&oss, AST_STATE_RINGING);
        } else
                ast_cli(fd, "No such extension '%s' in context '%s'\n", mye, myc);
        return RESULT_SUCCESS;
@@ -885,12 +915,45 @@ static char dial_usage[] =
 "Usage: dial [extension[@context]]\n"
 "       Dials a given extensison (";
 
+static int console_transfer(int fd, int argc, char *argv[])
+{
+       char tmp[256];
+       char *context;
+       if (argc != 2)
+               return RESULT_SHOWUSAGE;
+       if (oss.owner && oss.owner->bridge) {
+               strncpy(tmp, argv[1], sizeof(tmp) - 1);
+               context = strchr(tmp, '@');
+               if (context) {
+                       *context = '\0';
+                       context++;
+               } else
+                       context = oss.owner->context;
+               if (ast_exists_extension(oss.owner->bridge, context, tmp, 1, oss.owner->bridge->callerid)) {
+                       ast_cli(fd, "Whee, transferring %s to %s@%s.\n", 
+                                       oss.owner->bridge->name, tmp, context);
+                       if (ast_async_goto(oss.owner->bridge, context, tmp, 1, 1))
+                               ast_cli(fd, "Failed to transfer :(\n");
+               } else {
+                       ast_cli(fd, "No such extension exists\n");
+               }
+       } else {
+               ast_cli(fd, "There is no call to transfer\n");
+       }
+       return RESULT_SUCCESS;
+}
+
+static char transfer_usage[] =
+"Usage: transfer <extension>[@context]\n"
+"       Transfers the currently connected call to the given extension (and\n"
+"context if specified)\n";
 
 static struct ast_cli_entry myclis[] = {
        { { "answer", NULL }, console_answer, "Answer an incoming console call", answer_usage },
        { { "hangup", NULL }, console_hangup, "Hangup a call on the console", hangup_usage },
        { { "dial", NULL }, console_dial, "Dial an extension on the console", dial_usage },
-       { { "send text", NULL }, console_sendtext, "Send text to the remote device", sendtext_usage },
+       { { "transfer", NULL }, console_transfer, "Transfer a call to a different extension", transfer_usage },
+       { { "send", "text", NULL }, console_sendtext, "Send text to the remote device", sendtext_usage },
        { { "autoanswer", NULL }, console_autoanswer, "Sets/displays autoanswer", autoanswer_usage, autoanswer_complete }
 };
 
@@ -898,7 +961,7 @@ int load_module()
 {
        int res;
        int x;
-       struct ast_config *cfg = ast_load(config);
+       struct ast_config *cfg;
        struct ast_variable *v;
        res = pipe(sndcmd);
        if (res) {
@@ -922,7 +985,7 @@ int load_module()
        }
        for (x=0;x<sizeof(myclis)/sizeof(struct ast_cli_entry); x++)
                ast_cli_register(myclis + x);
-       if (cfg) {
+       if ((cfg = ast_load(config))) {
                v = ast_variable_browse(cfg, "general");
                while(v) {
                        if (!strcasecmp(v->name, "autoanswer"))
@@ -958,7 +1021,7 @@ int unload_module()
                close(sndcmd[1]);
        }
        if (oss.owner)
-               ast_softhangup(oss.owner);
+               ast_softhangup(oss.owner, AST_SOFTHANGUP_APPUNLOAD);
        if (oss.owner)
                return -1;
        return 0;
@@ -972,9 +1035,9 @@ char *description()
 int usecount()
 {
        int res;
-       ast_pthread_mutex_lock(&usecnt_lock);
+       ast_mutex_lock(&usecnt_lock);
        res = usecnt;
-       ast_pthread_mutex_unlock(&usecnt_lock);
+       ast_mutex_unlock(&usecnt_lock);
        return res;
 }