Merge Mahmut's recording patches
[asterisk/asterisk.git] / channel.c
index 74ab878..f1ea7f7 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -19,6 +19,9 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
+#include <math.h>                      /* For PI */
+#include <asterisk/pbx.h>
+#include <asterisk/frame.h>
 #include <asterisk/sched.h>
 #include <asterisk/options.h>
 #include <asterisk/channel.h>
 #include <asterisk/logger.h>
 #include <asterisk/file.h>
 #include <asterisk/translate.h>
+#include <asterisk/manager.h>
+#include <asterisk/chanvars.h>
+#include <asterisk/linkedlists.h>
+#include <asterisk/indications.h>
+#include <asterisk/monitor.h>
 
 
+static int shutting_down = 0;
+
 /* XXX Lock appropriately in more functions XXX */
 
 #ifdef DEBUG_MUTEX
@@ -61,7 +71,75 @@ struct ast_channel *channels = NULL;
 /* Protect the channel list (highly unlikely that two things would change
    it at the same time, but still! */
    
-static pthread_mutex_t chlock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t chlock = AST_MUTEX_INITIALIZER;
+
+int ast_check_hangup(struct ast_channel *chan)
+{
+time_t myt;
+
+         /* if soft hangup flag, return true */
+       if (chan->_softhangup) return 1;
+         /* if no private structure, return true */
+       if (!chan->pvt->pvt) return 1;
+         /* if no hangup scheduled, just return here */
+       if (!chan->whentohangup) return 0;
+       time(&myt); /* get current time */
+         /* return, if not yet */
+       if (chan->whentohangup > myt) return 0;
+       chan->_softhangup |= AST_SOFTHANGUP_TIMEOUT;
+       return 1;
+}
+
+void ast_begin_shutdown(int hangup)
+{
+       struct ast_channel *c;
+       shutting_down = 1;
+       if (hangup) {
+               PTHREAD_MUTEX_LOCK(&chlock);
+               c = channels;
+               while(c) {
+                       ast_softhangup(c, AST_SOFTHANGUP_SHUTDOWN);
+                       c = c->next;
+               }
+               PTHREAD_MUTEX_UNLOCK(&chlock);
+       }
+}
+
+int ast_active_channels(void)
+{
+       struct ast_channel *c;
+       int cnt = 0;
+       PTHREAD_MUTEX_LOCK(&chlock);
+       c = channels;
+       while(c) {
+               cnt++;
+               c = c->next;
+       }
+       PTHREAD_MUTEX_UNLOCK(&chlock);
+       return cnt;
+}
+
+void ast_cancel_shutdown(void)
+{
+       shutting_down = 0;
+}
+
+int ast_shutting_down(void)
+{
+       return shutting_down;
+}
+
+void ast_channel_setwhentohangup(struct ast_channel *chan, time_t offset)
+{
+time_t myt;
+
+       time(&myt);
+        if (offset)
+         chan->whentohangup = myt + offset;
+        else
+          chan->whentohangup = 0;
+       return;
+}
 
 int ast_channel_register(char *type, char *description, int capabilities,
                struct ast_channel *(*requester)(char *type, int format, void *data))
@@ -87,8 +165,8 @@ int ast_channel_register(char *type, char *description, int capabilities,
                PTHREAD_MUTEX_UNLOCK(&chlock);
                return -1;
        }
-       strncpy(chan->type, type, sizeof(chan->type));
-       strncpy(chan->description, description, sizeof(chan->description));
+       strncpy(chan->type, type, sizeof(chan->type)-1);
+       strncpy(chan->description, description, sizeof(chan->description)-1);
        chan->capabilities = capabilities;
        chan->requester = requester;
        chan->next = NULL;
@@ -147,9 +225,13 @@ int ast_best_codec(int fmts)
                /* Okay, we're down to vocoders now, so pick GSM because it's small and easier to
                   translate and sounds pretty good */
                AST_FORMAT_GSM,
+               /* Speex is free, but computationally more expensive than GSM */
+               AST_FORMAT_SPEEX,
                /* Ick, LPC10 sounds terrible, but at least we have code for it, if you're tacky enough
                   to use it */
                AST_FORMAT_LPC10,
+               /* G.729a is faster than 723 and slightly less expensive */
+               AST_FORMAT_G729A,
                /* Down to G.723.1 which is proprietary but at least designed for voice */
                AST_FORMAT_G723_1,
                /* Last and least, MP3 which was of course never designed for real-time voice */
@@ -164,11 +246,18 @@ int ast_best_codec(int fmts)
        return 0;
 }
 
-struct ast_channel *ast_channel_alloc(void)
+struct ast_channel *ast_channel_alloc(int needqueue)
 {
        struct ast_channel *tmp;
        struct ast_channel_pvt *pvt;
        int x;
+       int flags;
+       struct varshead *headp;        
+               
+       
+       /* If shutting down, don't allocate any new channels */
+       if (shutting_down)
+               return NULL;
        PTHREAD_MUTEX_LOCK(&chlock);
        tmp = malloc(sizeof(struct ast_channel));
        memset(tmp, 0, sizeof(struct ast_channel));
@@ -178,22 +267,50 @@ struct ast_channel *ast_channel_alloc(void)
                        memset(pvt, 0, sizeof(struct ast_channel_pvt));
                        tmp->sched = sched_context_create();
                        if (tmp->sched) {
-                               for (x=0;x<AST_MAX_FDS;x++)
+                               for (x=0;x<AST_MAX_FDS - 1;x++)
                                        tmp->fds[x] = -1;
-                               strncpy(tmp->name, "**Unknown**", sizeof(tmp->name));
-                               tmp->pvt = pvt;
-                               tmp->state = AST_STATE_DOWN;
-                               tmp->stack = -1;
-                               tmp->streamid = -1;
-                               tmp->appl = NULL;
-                               tmp->data = NULL;
-                               pthread_mutex_init(&tmp->lock, NULL);
-                               strncpy(tmp->context, "default", sizeof(tmp->context));
-                               strncpy(tmp->language, defaultlanguage, sizeof(tmp->language));
-                               strncpy(tmp->exten, "s", sizeof(tmp->exten));
-                               tmp->priority=1;
-                               tmp->next = channels;
-                               channels= tmp;
+                               if (needqueue &&  
+                                       pipe(pvt->alertpipe)) {
+                                       ast_log(LOG_WARNING, "Alert pipe creation failed!\n");
+                                       free(pvt);
+                                       free(tmp);
+                                       tmp = NULL;
+                                       pvt = NULL;
+                               } else {
+                                       /* Make sure we've got it done right if they don't */
+                                       if (needqueue) {
+                                               flags = fcntl(pvt->alertpipe[0], F_GETFL);
+                                               fcntl(pvt->alertpipe[0], F_SETFL, flags | O_NONBLOCK);
+                                               flags = fcntl(pvt->alertpipe[1], F_GETFL);
+                                               fcntl(pvt->alertpipe[1], F_SETFL, flags | O_NONBLOCK);
+                                       } else
+                                               pvt->alertpipe[0] = pvt->alertpipe[1] = -1;
+                                       /* Always watch the alertpipe */
+                                       tmp->fds[AST_MAX_FDS-1] = pvt->alertpipe[0];
+                                       strncpy(tmp->name, "**Unknown**", sizeof(tmp->name)-1);
+                                       tmp->pvt = pvt;
+                                       /* Initial state */
+                                       tmp->_state = AST_STATE_DOWN;
+                                       tmp->stack = -1;
+                                       tmp->streamid = -1;
+                                       tmp->appl = NULL;
+                                       tmp->data = NULL;
+                                       tmp->fin = 0;
+                                       tmp->fout = 0;
+                                       headp=&tmp->varshead;
+                                       ast_pthread_mutex_init(&tmp->lock);
+                                       AST_LIST_HEAD_INIT(headp);
+                                       tmp->vars=ast_var_assign("tempvar","tempval");
+                                       AST_LIST_INSERT_HEAD(headp,tmp->vars,entries);
+                                       strncpy(tmp->context, "default", sizeof(tmp->context)-1);
+                                       strncpy(tmp->language, defaultlanguage, sizeof(tmp->language)-1);
+                                       strncpy(tmp->exten, "s", sizeof(tmp->exten)-1);
+                                       tmp->priority=1;
+                                       tmp->amaflags = ast_default_amaflags;
+                                       strncpy(tmp->accountcode, ast_default_accountcode, sizeof(tmp->accountcode)-1);
+                                       tmp->next = channels;
+                                       channels= tmp;
+                               }
                        } else {
                                ast_log(LOG_WARNING, "Unable to create schedule context\n");
                                free(tmp);
@@ -210,6 +327,68 @@ struct ast_channel *ast_channel_alloc(void)
        return tmp;
 }
 
+int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, int lock)
+{
+       struct ast_frame *f;
+       struct ast_frame *prev, *cur;
+       int blah = 1;
+       int qlen = 0;
+       /* Build us a copy and free the original one */
+       f = ast_frdup(fin);
+       if (!f) {
+               ast_log(LOG_WARNING, "Unable to duplicate frame\n");
+               return -1;
+       }
+       if (lock)
+               ast_pthread_mutex_lock(&chan->lock);
+       prev = NULL;
+       cur = chan->pvt->readq;
+       while(cur) {
+               prev = cur;
+               cur = cur->next;
+               qlen++;
+       }
+       /* Allow up to 96 voice frames outstanding, and up to 128 total frames */
+       if (((fin->frametype == AST_FRAME_VOICE) && (qlen > 96)) || (qlen  > 128)) {
+               if (fin->frametype != AST_FRAME_VOICE) {
+                       ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name);
+                       CRASH;
+               } else {
+                       ast_log(LOG_DEBUG, "Dropping voice to exceptionally long queue on %s\n", chan->name);
+                       ast_frfree(fin);
+                       if (lock)
+                               ast_pthread_mutex_unlock(&chan->lock);
+                       return 0;
+               }
+       }
+       if (prev)
+               prev->next = f;
+       else
+               chan->pvt->readq = f;
+       if (chan->pvt->alertpipe[1] > -1) {
+               if (write(chan->pvt->alertpipe[1], &blah, sizeof(blah)) != sizeof(blah))
+                       ast_log(LOG_WARNING, "Unable to write to alert pipe on %s, frametype/subclass %d/%d (qlen = %d): %s!\n",
+                               chan->name, f->frametype, f->subclass, qlen, strerror(errno));
+       }
+       if (lock)
+               ast_pthread_mutex_unlock(&chan->lock);
+       return 0;
+}
+
+int ast_queue_hangup(struct ast_channel *chan, int lock)
+{
+       struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP };
+       chan->_softhangup |= AST_SOFTHANGUP_DEV;
+       return ast_queue_frame(chan, &f, lock);
+}
+
+int ast_queue_control(struct ast_channel *chan, int control, int lock)
+{
+       struct ast_frame f = { AST_FRAME_CONTROL, };
+       f.subclass = control;
+       return ast_queue_frame(chan, &f, lock);
+}
+
 int ast_channel_defer_dtmf(struct ast_channel *chan)
 {
        int pre = 0;
@@ -245,9 +424,54 @@ struct ast_channel *ast_channel_walk(struct ast_channel *prev)
        
 }
 
+int ast_safe_sleep_conditional(        struct ast_channel *chan, int ms,
+                                                               int (*cond)(void*), void *data )
+{
+       struct ast_frame *f;
+
+       while(ms > 0) {
+               if( cond && ((*cond)(data) == 0 ) )
+                       return 0;
+               ms = ast_waitfor(chan, ms);
+               if (ms <0)
+                       return -1;
+               if (ms > 0) {
+                       f = ast_read(chan);
+                       if (!f)
+                               return -1;
+                       ast_frfree(f);
+               }
+       }
+       return 0;
+}
+
+int ast_safe_sleep(struct ast_channel *chan, int ms)
+{
+       struct ast_frame *f;
+       while(ms > 0) {
+               ms = ast_waitfor(chan, ms);
+               if (ms <0)
+                       return -1;
+               if (ms > 0) {
+                       f = ast_read(chan);
+                       if (!f)
+                               return -1;
+                       ast_frfree(f);
+               }
+       }
+       return 0;
+}
+
 void ast_channel_free(struct ast_channel *chan)
 {
        struct ast_channel *last=NULL, *cur;
+       int fd;
+       struct ast_var_t *vardata;
+       struct ast_frame *f, *fp;
+       struct varshead *headp;
+       
+       headp=&chan->varshead;
+       
        PTHREAD_MUTEX_LOCK(&chlock);
        cur = channels;
        while(cur) {
@@ -265,6 +489,10 @@ void ast_channel_free(struct ast_channel *chan)
                ast_log(LOG_WARNING, "Unable to find channel in list\n");
        if (chan->pvt->pvt)
                ast_log(LOG_WARNING, "Channel '%s' may not have been hung up properly\n", chan->name);
+       /* Stop monitoring */
+       if (chan->monitor) {
+               chan->monitor->stop( chan, 0 );
+       }
        /* Free translatosr */
        if (chan->pvt->readtrans)
                ast_translator_free_path(chan->pvt->readtrans);
@@ -276,25 +504,67 @@ void ast_channel_free(struct ast_channel *chan)
                free(chan->dnid);
        if (chan->callerid)
                free(chan->callerid);   
+       if (chan->ani)
+               free(chan->ani);
+       if (chan->rdnis)
+               free(chan->rdnis);
        pthread_mutex_destroy(&chan->lock);
+       /* Close pipes if appropriate */
+       if ((fd = chan->pvt->alertpipe[0]) > -1)
+               close(fd);
+       if ((fd = chan->pvt->alertpipe[1]) > -1)
+               close(fd);
+       f = chan->pvt->readq;
+       chan->pvt->readq = NULL;
+       while(f) {
+               fp = f;
+               f = f->next;
+               ast_frfree(fp);
+       }
+       
+       /* loop over the variables list, freeing all data and deleting list items */
+       /* no need to lock the list, as the channel is already locked */
+       
+       while (!AST_LIST_EMPTY(headp)) {           /* List Deletion. */
+                   vardata = AST_LIST_FIRST(headp);
+                   AST_LIST_REMOVE_HEAD(headp, entries);
+//                 printf("deleting var %s=%s\n",ast_var_name(vardata),ast_var_value(vardata));
+                   ast_var_delete(vardata);
+       }
+                                                        
+
        free(chan->pvt);
+       chan->pvt = NULL;
        free(chan);
        PTHREAD_MUTEX_UNLOCK(&chlock);
 }
 
-int ast_softhangup(struct ast_channel *chan)
+int ast_softhangup_nolock(struct ast_channel *chan, int cause)
 {
        int res = 0;
+       struct ast_frame f = { AST_FRAME_NULL };
        if (option_debug)
                ast_log(LOG_DEBUG, "Soft-Hanging up channel '%s'\n", chan->name);
        /* Inform channel driver that we need to be hung up, if it cares */
-       chan->softhangup = 1;           
+       chan->_softhangup |= cause;
+       ast_queue_frame(chan, &f, 0);
        /* Interrupt any select call or such */
        if (chan->blocking)
                pthread_kill(chan->blocker, SIGURG);
        return res;
 }
 
+int ast_softhangup(struct ast_channel *chan, int cause)
+{
+       int res;
+       ast_pthread_mutex_lock(&chan->lock);
+       res = ast_softhangup_nolock(chan, cause);
+       ast_pthread_mutex_unlock(&chan->lock);
+       return res;
+}
+
+static int ast_do_masquerade(struct ast_channel *original);
+
 static void free_translation(struct ast_channel *clone)
 {
        if (clone->pvt->writetrans)
@@ -314,7 +584,12 @@ int ast_hangup(struct ast_channel *chan)
           if someone is going to masquerade as us */
        ast_pthread_mutex_lock(&chan->lock);
        if (chan->masq) {
-               ast_log(LOG_WARNING, "We're getting hung up, but someone is trying to masq into us?!?\n");
+               if (ast_do_masquerade(chan)) 
+                       ast_log(LOG_WARNING, "Failed to perform masquerade\n");
+       }
+
+       if (chan->masq) {
+               ast_log(LOG_WARNING, "%s getting hung up, but someone is trying to masq into us?!?\n", chan->name);
                ast_pthread_mutex_unlock(&chan->lock);
                return 0;
        }
@@ -330,6 +605,18 @@ int ast_hangup(struct ast_channel *chan)
                ast_stopstream(chan);
        if (chan->sched)
                sched_context_destroy(chan->sched);
+       /* Clear any tone stuff remaining */
+       if (chan->generatordata)
+               chan->generator->release(chan, chan->generatordata);
+       chan->generatordata = NULL;
+       chan->generator = NULL;
+       if (chan->cdr) {
+               /* End the CDR if it hasn't already */
+               ast_cdr_end(chan->cdr);
+               /* Post and Free the CDR */
+               ast_cdr_post(chan->cdr);
+               ast_cdr_free(chan->cdr);
+       }
        if (chan->blocking) {
                ast_log(LOG_WARNING, "Hard hangup called by thread %ld on %s, while fd "
                                        "is blocked by thread %ld in procedure %s!  Expect a failure\n",
@@ -346,6 +633,9 @@ int ast_hangup(struct ast_channel *chan)
                        ast_log(LOG_DEBUG, "Hanging up zombie '%s'\n", chan->name);
                        
        ast_pthread_mutex_unlock(&chan->lock);
+       manager_event(EVENT_FLAG_CALL, "Hangup", 
+                       "Channel: %s\r\n",
+                       chan->name);
        ast_channel_free(chan);
        return res;
 }
@@ -380,22 +670,50 @@ int ast_answer(struct ast_channel *chan)
 {
        int res = 0;
        /* Stop if we're a zombie or need a soft hangup */
-       if (chan->zombie || chan->softhangup) 
+       if (chan->zombie || ast_check_hangup(chan)) 
                return -1;
-       switch(chan->state) {
+       switch(chan->_state) {
        case AST_STATE_RINGING:
        case AST_STATE_RING:
                if (chan->pvt->answer)
                        res = chan->pvt->answer(chan);
-               chan->state = AST_STATE_UP;
+               ast_setstate(chan, AST_STATE_UP);
+               if (chan->cdr)
+                       ast_cdr_answer(chan->cdr);
                return res;
                break;
        case AST_STATE_UP:
+               if (chan->cdr)
+                       ast_cdr_answer(chan->cdr);
                break;
        }
        return 0;
 }
 
+void ast_deactivate_generator(struct ast_channel *chan)
+{
+       if (chan->generatordata) {
+               chan->generator->release(chan, chan->generatordata);
+               chan->generatordata = NULL;
+               chan->generator = NULL;
+               chan->writeinterrupt = 0;
+       }
+}
+
+int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, void *params)
+{
+       if (chan->generatordata) {
+               chan->generator->release(chan, chan->generatordata);
+               chan->generatordata = NULL;
+       }
+       if ((chan->generatordata = gen->alloc(chan, params))) {
+               chan->generator = gen;
+       } else {
+               return -1;
+       }
+       return 0;
+}
+
 int ast_waitfor_n_fd(int *fds, int n, int *ms, int *exception)
 {
        /* Wait for x amount of time on a file descriptor to have input.  */
@@ -442,8 +760,6 @@ int ast_waitfor_n_fd(int *fds, int n, int *ms, int *exception)
        return winner;
 }
 
-static int ast_do_masquerade(struct ast_channel *original);
-
 struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds, int nfds, 
        int *exception, int *outfd, int *ms)
 {
@@ -473,9 +789,10 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
        tv.tv_usec = (*ms % 1000) * 1000;
        FD_ZERO(&rfds);
        FD_ZERO(&efds);
+
        for (x=0;x<n;x++) {
                for (y=0;y<AST_MAX_FDS;y++) {
-                       if (c[x]->fds[y] > 0) {
+                       if (c[x]->fds[y] > -1) {
                                FD_SET(c[x]->fds[y], &rfds);
                                FD_SET(c[x]->fds[y], &efds);
                                if (c[x]->fds[y] > max)
@@ -501,8 +818,12 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
                /* Simulate a timeout if we were interrupted */
                if (errno != EINTR)
                        *ms = -1;
-               else
+               else {
+                       /* Just an interrupt */
+#if 0
                        *ms = 0;
+#endif                 
+               }
                return NULL;
        }
 
@@ -554,10 +875,11 @@ int ast_waitfor(struct ast_channel *c, int ms)
 
 char ast_waitfordigit(struct ast_channel *c, int ms)
 {
+       /* XXX Should I be merged with waitfordigit_full XXX */
        struct ast_frame *f;
        char result = 0;
        /* Stop if we're a zombie or need a soft hangup */
-       if (c->zombie || c->softhangup) 
+       if (c->zombie || ast_check_hangup(c)) 
                return -1;
        /* Wait for a digit, no more than ms milliseconds total. */
        while(ms && !result) {
@@ -578,15 +900,46 @@ char ast_waitfordigit(struct ast_channel *c, int ms)
        return result;
 }
 
+char ast_waitfordigit_full(struct ast_channel *c, int ms, int audio, int ctrl)
+{
+       struct ast_frame *f;
+       char result = 0;
+       struct ast_channel *rchan;
+       int outfd;
+       /* Stop if we're a zombie or need a soft hangup */
+       if (c->zombie || ast_check_hangup(c)) 
+               return -1;
+       /* Wait for a digit, no more than ms milliseconds total. */
+       while(ms && !result) {
+               rchan = ast_waitfor_nandfds(&c, 1, &audio, (audio > -1) ? 1 : 0, NULL, &outfd, &ms);
+               if ((!rchan) && (outfd < 0) && (ms)) /* Error */
+                       result = -1; 
+               else if (outfd > -1) {
+                       result = 1;
+               } else if (rchan) {
+                       /* Read something */
+                       f = ast_read(c);
+                       if (f) {
+                               if (f->frametype == AST_FRAME_DTMF) 
+                                       result = f->subclass;
+                               ast_frfree(f);
+                       } else
+                               result = -1;
+               }
+       }
+       return result;
+}
+
 struct ast_frame *ast_read(struct ast_channel *chan)
 {
        struct ast_frame *f = NULL;
+       int blah;
        static struct ast_frame null_frame = 
        {
                AST_FRAME_NULL,
        };
        
-       pthread_mutex_lock(&chan->lock);
+       ast_pthread_mutex_lock(&chan->lock);
        if (chan->masq) {
                if (ast_do_masquerade(chan)) {
                        ast_log(LOG_WARNING, "Failed to perform masquerade\n");
@@ -598,11 +951,13 @@ struct ast_frame *ast_read(struct ast_channel *chan)
        }
 
        /* Stop if we're a zombie or need a soft hangup */
-       if (chan->zombie || chan->softhangup) {
+       if (chan->zombie || ast_check_hangup(chan)) {
+               if (chan->generator)
+                       ast_deactivate_generator(chan);
                pthread_mutex_unlock(&chan->lock);
                return NULL;
        }
-       
+
        if (!chan->deferdtmf && strlen(chan->dtmfq)) {
                /* We have DTMF that has been deferred.  Return it now */
                chan->dtmff.frametype = AST_FRAME_DTMF;
@@ -613,38 +968,97 @@ struct ast_frame *ast_read(struct ast_channel *chan)
                return &chan->dtmff;
        }
        
-       chan->blocker = pthread_self();
-       if (chan->exception) {
-               if (chan->pvt->exception) 
-                       f = chan->pvt->exception(chan);
+       /* Read and ignore anything on the alertpipe, but read only
+          one sizeof(blah) per frame that we send from it */
+       if (chan->pvt->alertpipe[0] > -1) {
+               read(chan->pvt->alertpipe[0], &blah, sizeof(blah));
+       }
+
+       /* Check for pending read queue */
+       if (chan->pvt->readq) {
+               f = chan->pvt->readq;
+               chan->pvt->readq = f->next;
+               /* Interpret hangup and return NULL */
+               if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP))
+                       f = NULL;
+       } else {
+               chan->blocker = pthread_self();
+               if (chan->exception) {
+                       if (chan->pvt->exception) 
+                               f = chan->pvt->exception(chan);
+                       else {
+                               ast_log(LOG_WARNING, "Exception flag set on '%s', but no exception handler\n", chan->name);
+                               f = &null_frame;
+                       }
+                       /* Clear the exception flag */
+                       chan->exception = 0;
+               } else
+               if (chan->pvt->read)
+                       f = chan->pvt->read(chan);
                else
-                       ast_log(LOG_WARNING, "Exception flag set, but no exception handler\n");
-               /* Clear the exception flag */
-               chan->exception = 0;
-       } else
-       if (chan->pvt->read)
-               f = chan->pvt->read(chan);
-       else
-               ast_log(LOG_WARNING, "No read routine on channel %s\n", chan);
+                       ast_log(LOG_WARNING, "No read routine on channel %s\n", chan->name);
+       }
+
+
        if (f && (f->frametype == AST_FRAME_VOICE)) {
-               if (chan->pvt->readtrans) {
+               if (!(f->subclass & chan->nativeformats)) {
+                       /* This frame can't be from the current native formats -- drop it on the
+                          floor */
+                       ast_log(LOG_NOTICE, "Dropping incompatible voice frame on %s of format %d since our native format has changed to %d\n", chan->name, f->subclass, chan->nativeformats);
+                       ast_frfree(f);
+                       f = &null_frame;
+               } else if (chan->pvt->readtrans) {
                        f = ast_translate(chan->pvt->readtrans, f, 1);
                        if (!f)
                                f = &null_frame;
                }
        }
+
        /* Make sure we always return NULL in the future */
-       if (!f)
-               chan->softhangup = 1;
-       else if (chan->deferdtmf && f->frametype == AST_FRAME_DTMF) {
+       if (!f) {
+               chan->_softhangup |= AST_SOFTHANGUP_DEV;
+               if (chan->generator)
+                       ast_deactivate_generator(chan);
+               /* End the CDR if appropriate */
+               if (chan->cdr)
+                       ast_cdr_end(chan->cdr);
+       } else if (chan->deferdtmf && f->frametype == AST_FRAME_DTMF) {
                if (strlen(chan->dtmfq) < sizeof(chan->dtmfq) - 2)
                        chan->dtmfq[strlen(chan->dtmfq)] = f->subclass;
                else
                        ast_log(LOG_WARNING, "Dropping deferred DTMF digits on %s\n", chan->name);
                f = &null_frame;
+       } else if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_ANSWER)) {
+               /* Answer the CDR */
+               ast_setstate(chan, AST_STATE_UP);
+               ast_cdr_answer(chan->cdr);
+       } else if( ( f->frametype == AST_FRAME_VOICE ) && chan->monitor && chan->monitor->read_stream ) {
+               if( ast_writestream( chan->monitor->read_stream, f ) < 0 ) {
+                       ast_log(LOG_WARNING, "Failed to write data to channel monitor read stream\n");
+               }
        }
        pthread_mutex_unlock(&chan->lock);
 
+       /* Run any generator sitting on the line */
+       if (f && (f->frametype == AST_FRAME_VOICE) && chan->generatordata) {
+               /* Mask generator data temporarily */
+               void *tmp;
+               int res;
+               tmp = chan->generatordata;
+               chan->generatordata = NULL;
+               res = chan->generator->generate(chan, tmp, f->datalen, f->samples);
+               chan->generatordata = tmp;
+               if (res) {
+                       ast_log(LOG_DEBUG, "Auto-deactivating generator\n");
+                       ast_deactivate_generator(chan);
+               }
+       }
+       if (chan->fin & 0x80000000)
+               ast_frame_dump(chan->name, f, "<<");
+       if ((chan->fin & 0x7fffffff) == 0x7fffffff)
+               chan->fin &= 0x80000000;
+       else
+               chan->fin++;
        return f;
 }
 
@@ -652,22 +1066,77 @@ int ast_indicate(struct ast_channel *chan, int condition)
 {
        int res = -1;
        /* Stop if we're a zombie or need a soft hangup */
-       if (chan->zombie || chan->softhangup) 
+       if (chan->zombie || ast_check_hangup(chan)) 
                return -1;
-       if (chan->pvt->indicate) {
+       if (chan->pvt->indicate)
                res = chan->pvt->indicate(chan, condition);
-               if (res)
-                       ast_log(LOG_WARNING, "Driver for channel '%s' failed to indicate condition %d\n", chan->name, condition);
-       } else
-               ast_log(LOG_WARNING, "Driver for channel '%s' does not support indication\n", chan->name);
-       return res;
+       if (!chan->pvt->indicate || res) {
+               /*
+                * Device does not support (that) indication, lets fake
+                * it by doing our own tone generation. (PM2002)
+                */
+               if (condition >= 0) {
+                       const struct tone_zone_sound *ts = NULL;
+                       switch (condition) {
+                        case AST_CONTROL_RINGING:
+                               ts = ast_get_indication_tone(chan->zone, "ring");
+                               break;
+                        case AST_CONTROL_BUSY:
+                               ts = ast_get_indication_tone(chan->zone, "busy");
+                               break;
+                        case AST_CONTROL_CONGESTION:
+                               ts = ast_get_indication_tone(chan->zone, "congestion");
+                               break;
+                       }
+                       if (ts && ts->data[0]) {
+                               ast_log(LOG_DEBUG, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition);
+                               ast_playtones_start(chan,0,ts->data, 1);
+                       }
+                       else  {
+                               /* not handled */
+                               ast_log(LOG_WARNING, "Unable to handle indication %d for '%s'\n", condition, chan->name);
+                               return -1;
+                       }
+               }
+               else ast_playtones_stop(chan);
+       }
+       return 0;
+}
+
+int ast_recvchar(struct ast_channel *chan, int timeout)
+{
+       int res,ourto,c;
+       struct ast_frame *f;
+       
+       ourto = timeout;
+       for(;;)
+          {
+               if (ast_check_hangup(chan)) return -1;
+               res = ast_waitfor(chan,ourto);
+               if (res <= 0) /* if timeout */
+                  {
+                       return 0;
+                  }
+               ourto = res;
+               f = ast_read(chan);
+               if (f == NULL) return -1; /* if hangup */
+               if ((f->frametype == AST_FRAME_CONTROL) &&
+                   (f->subclass == AST_CONTROL_HANGUP)) return -1; /* if hangup */
+               if (f->frametype == AST_FRAME_TEXT)  /* if a text frame */
+                  {
+                       c = *((char *)f->data);  /* get the data */
+                       ast_frfree(f);
+                       return(c);
+                  }
+               ast_frfree(f);
+       }
 }
 
 int ast_sendtext(struct ast_channel *chan, char *text)
 {
        int res = 0;
        /* Stop if we're a zombie or need a soft hangup */
-       if (chan->zombie || chan->softhangup) 
+       if (chan->zombie || ast_check_hangup(chan)) 
                return -1;
        CHECK_BLOCKING(chan);
        if (chan->pvt->send_text)
@@ -676,12 +1145,57 @@ int ast_sendtext(struct ast_channel *chan, char *text)
        return res;
 }
 
+static int do_senddigit(struct ast_channel *chan, char digit)
+{
+       int res = -1;
+
+       if (chan->pvt->send_digit)
+               res = chan->pvt->send_digit(chan, digit);
+       if (!chan->pvt->send_digit || res) {
+               /*
+                * Device does not support DTMF tones, lets fake
+                * it by doing our own generation. (PM2002)
+                */
+               static const char* dtmf_tones[] = {
+                       "!941+1336/50,!0/50",   /* 0 */
+                       "!697+1209/50,!0/50",   /* 1 */
+                       "!697+1336/50,!0/50",   /* 2 */
+                       "!697+1477/50,!0/50",   /* 3 */
+                       "!770+1209/50,!0/50",   /* 4 */
+                       "!770+1336/50,!0/50",   /* 5 */
+                       "!770+1477/50,!0/50",   /* 6 */
+                       "!852+1209/50,!0/50",   /* 7 */
+                       "!852+1336/50,!0/50",   /* 8 */
+                       "!852+1477/50,!0/50",   /* 9 */
+                       "!697+1633/50,!0/50",   /* A */
+                       "!770+1633/50,!0/50",   /* B */
+                       "!852+1633/50,!0/50",   /* C */
+                       "!941+1633/50,!0/50",   /* D */
+                       "!941+1209/50,!0/50",   /* * */
+                       "!941+1477/50,!0/50" }; /* # */
+               if (digit >= '0' && digit <='9')
+                       ast_playtones_start(chan,0,dtmf_tones[digit-'0'], 0);
+               else if (digit >= 'A' && digit <= 'D')
+                       ast_playtones_start(chan,0,dtmf_tones[digit-'A'+10], 0);
+               else if (digit == '*')
+                       ast_playtones_start(chan,0,dtmf_tones[14], 0);
+               else if (digit == '#')
+                       ast_playtones_start(chan,0,dtmf_tones[15], 0);
+               else {
+                       /* not handled */
+                       ast_log(LOG_WARNING, "Unable to handle DTMF tone '%c' for '%s'\n", digit, chan->name);
+                       return -1;
+               }
+       }
+       return 0;
+}
+
 int ast_write(struct ast_channel *chan, struct ast_frame *fr)
 {
        int res = -1;
-       struct ast_frame *f;
+       struct ast_frame *f = NULL;
        /* Stop if we're a zombie or need a soft hangup */
-       if (chan->zombie || chan->softhangup) 
+       if (chan->zombie || ast_check_hangup(chan)) 
                return -1;
        /* Handle any pending masquerades */
        if (chan->masq) {
@@ -692,6 +1206,14 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
        }
        if (chan->masqr)
                return 0;
+       if (chan->generatordata) {
+               if (chan->writeinterrupt)
+                       ast_deactivate_generator(chan);
+               else
+                       return 0;
+       }
+       if (chan->fout & 0x80000000)
+               ast_frame_dump(chan->name, fr, ">>");
        CHECK_BLOCKING(chan);
        switch(fr->frametype) {
        case AST_FRAME_CONTROL:
@@ -699,23 +1221,46 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
                ast_log(LOG_WARNING, "Don't know how to handle control frames yet\n");
                break;
        case AST_FRAME_DTMF:
-               
-               if (chan->pvt->send_digit)
-                       res = chan->pvt->send_digit(chan, fr->subclass);
+               res = do_senddigit(chan,fr->subclass);
+               break;
+       case AST_FRAME_TEXT:
+               if (chan->pvt->send_text)
+                       res = chan->pvt->send_text(chan, (char *) fr->data);
                break;
        default:
                if (chan->pvt->write) {
                        if (chan->pvt->writetrans) {
-                               f = ast_translate(chan->pvt->writetrans, fr, 1);
+                               f = ast_translate(chan->pvt->writetrans, fr, 0);
                        } else
                                f = fr;
                        if (f)  
+                       {
                                res = chan->pvt->write(chan, f);
+                               if( chan->monitor &&
+                                               chan->monitor->write_stream &&
+                                               f && ( f->frametype == AST_FRAME_VOICE ) ) {
+                                       if( ast_writestream( chan->monitor->write_stream, f ) < 0 ) {
+                                               ast_log(LOG_WARNING, "Failed to write data to channel monitor write stream\n");
+                                       }
+                               }
+                       }
                        else
                                res = 0;
                }
        }
+       if (f && (f != fr))
+               ast_frfree(f);
        chan->blocking = 0;
+       /* Consider a write failure to force a soft hangup */
+       if (res < 0)
+               chan->_softhangup |= AST_SOFTHANGUP_DEV;
+       else {
+               if ((chan->fout & 0x7fffffff) == 0x7fffffff)
+                       chan->fout &= 0x80000000;
+               else
+                       chan->fout++;
+               chan->fout++;
+       }
        return res;
 }
 
@@ -744,7 +1289,7 @@ int ast_set_write_format(struct ast_channel *chan, int fmts)
        /* Build a translation path from the user write format to the raw writing format */
        chan->pvt->writetrans = ast_translator_build_path(chan->pvt->rawwriteformat, chan->writeformat);
        if (option_debug)
-               ast_log(LOG_DEBUG, "Set channel %s to format %d\n", chan->name, chan->writeformat);
+               ast_log(LOG_DEBUG, "Set channel %s to write format %d\n", chan->name, chan->writeformat);
        return 0;
 }
 
@@ -772,9 +1317,72 @@ int ast_set_read_format(struct ast_channel *chan, int fmts)
                ast_translator_free_path(chan->pvt->readtrans);
        /* Build a translation path from the raw read format to the user reading format */
        chan->pvt->readtrans = ast_translator_build_path(chan->readformat, chan->pvt->rawreadformat);
+       if (option_debug)
+               ast_log(LOG_DEBUG, "Set channel %s to read format %d\n", chan->name, chan->readformat);
        return 0;
 }
 
+struct ast_channel *ast_request_and_dial(char *type, int format, void *data, int timeout, int *outstate, char *callerid)
+{
+       int state = 0;
+       struct ast_channel *chan;
+       struct ast_frame *f;
+       int res;
+       
+       chan = ast_request(type, format, data);
+       if (chan) {
+               if (callerid)
+                       ast_set_callerid(chan, callerid, 1);
+               if (!ast_call(chan, data, 0)) {
+                       while(timeout && (chan->_state != AST_STATE_UP)) {
+                               res = ast_waitfor(chan, timeout);
+                               if (res < 0) {
+                                       /* Something not cool, or timed out */
+                                       ast_hangup(chan);
+                                       chan = NULL;
+                                       break;
+                               }
+                               /* If done, break out */
+                               if (!res)
+                                       break;
+                               if (timeout > -1)
+                                       timeout = res;
+                               f = ast_read(chan);
+                               if (!f) {
+                                       state = AST_CONTROL_HANGUP;
+                                       ast_hangup(chan);
+                                       chan = NULL;
+                                       break;
+                               }
+                               if (f->frametype == AST_FRAME_CONTROL) {
+                                       if (f->subclass == AST_CONTROL_RINGING)
+                                               state = AST_CONTROL_RINGING;
+                                       else if ((f->subclass == AST_CONTROL_BUSY) || (f->subclass == AST_CONTROL_CONGESTION)) {
+                                               state = f->subclass;
+                                               break;
+                                       } else if (f->subclass == AST_CONTROL_ANSWER) {
+                                               state = f->subclass;
+                                               break;
+                                       } else {
+                                               ast_log(LOG_NOTICE, "Don't know what to do with control frame %d\n", f->subclass);
+                                       }
+                               }
+                               ast_frfree(f);
+                       }
+               } else {
+                       ast_hangup(chan);
+                       chan = NULL;
+                       ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
+               }
+       } else
+               ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
+       if (chan && (chan->_state == AST_STATE_UP))
+               state = AST_CONTROL_ANSWER;
+       if (outstate)
+               *outstate = state;
+       return chan;
+}
+
 struct ast_channel *ast_request(char *type, int format, void *data)
 {
        struct chanlist *chan;
@@ -800,6 +1408,13 @@ struct ast_channel *ast_request(char *type, int format, void *data)
                        PTHREAD_MUTEX_UNLOCK(&chlock);
                        if (chan->requester)
                                c = chan->requester(type, capabilities, data);
+                       if (c) {
+                               manager_event(EVENT_FLAG_CALL, "Newchannel",
+                               "Channel: %s\r\n"
+                               "State: %s\r\n"
+                               "Callerid: %s\r\n",
+                               c->name, ast_state2str(c->_state), c->callerid ? c->callerid : "<unknown>");
+                       }
                        return c;
                }
                chan = chan->next;
@@ -817,8 +1432,8 @@ int ast_call(struct ast_channel *chan, char *addr, int timeout)
           return anyway.  */
        int res = -1;
        /* Stop if we're a zombie or need a soft hangup */
-       pthread_mutex_lock(&chan->lock);
-       if (!chan->zombie && !chan->softhangup) 
+       ast_pthread_mutex_lock(&chan->lock);
+       if (!chan->zombie && !ast_check_hangup(chan)) 
                if (chan->pvt->call)
                        res = chan->pvt->call(chan, addr, timeout);
        pthread_mutex_unlock(&chan->lock);
@@ -830,8 +1445,9 @@ int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int fti
        int pos=0;
        int to = ftimeout;
        char d;
+       /* XXX Merge with full version? XXX */
        /* Stop if we're a zombie or need a soft hangup */
-       if (c->zombie || c->softhangup) 
+       if (c->zombie || ast_check_hangup(c)) 
                return -1;
        if (!len)
                return -1;
@@ -853,7 +1469,49 @@ int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int fti
                }
                if (!strchr(enders, d))
                        s[pos++] = d;
-               if (strchr(enders, d) || (pos >= len - 1)) {
+               if (strchr(enders, d) || (pos >= len)) {
+                       s[pos]='\0';
+                       return 0;
+               }
+               to = timeout;
+       } while(1);
+       /* Never reached */
+       return 0;
+}
+
+int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, int ftimeout, char *enders, int audiofd, int ctrlfd)
+{
+       int pos=0;
+       int to = ftimeout;
+       char d;
+       /* Stop if we're a zombie or need a soft hangup */
+       if (c->zombie || ast_check_hangup(c)) 
+               return -1;
+       if (!len)
+               return -1;
+       do {
+               if (c->streamid > -1) {
+                       d = ast_waitstream_full(c, AST_DIGIT_ANY, audiofd, ctrlfd);
+                       ast_stopstream(c);
+                       usleep(1000);
+                       if (!d)
+                               d = ast_waitfordigit_full(c, to, audiofd, ctrlfd);
+               } else {
+                       d = ast_waitfordigit_full(c, to, audiofd, ctrlfd);
+               }
+               if (d < 0)
+                       return -1;
+               if (d == 0) {
+                       s[pos]='\0';
+                       return 1;
+               }
+               if (d == 1) {
+                       s[pos]='\0';
+                       return 2;
+               }
+               if (!strchr(enders, d))
+                       s[pos++] = d;
+               if (strchr(enders, d) || (pos >= len)) {
                        s[pos]='\0';
                        return 0;
                }
@@ -893,19 +1551,19 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
        chanf = chan->nativeformats;
        res = ast_translator_best_choice(&peerf, &chanf);
        if (res < 0) {
-               ast_log(LOG_WARNING, "No path to translate from %s(%d) to %s(%d)\n", chan, chan->nativeformats, peer, peer->nativeformats);
+               ast_log(LOG_WARNING, "No path to translate from %s(%d) to %s(%d)\n", chan->name, chan->nativeformats, peer->name, peer->nativeformats);
                return -1;
        }
        /* Set read format on channel */
        res = ast_set_read_format(chan, peerf);
        if (res < 0) {
-               ast_log(LOG_WARNING, "Unable to set read format on channel %s to %d\n", chan, chanf);
+               ast_log(LOG_WARNING, "Unable to set read format on channel %s to %d\n", chan->name, chanf);
                return -1;
        }
        /* Set write format on peer channel */
        res = ast_set_write_format(peer, peerf);
        if (res < 0) {
-               ast_log(LOG_WARNING, "Unable to set write format on channel %s to %d\n", peer, peerf);
+               ast_log(LOG_WARNING, "Unable to set write format on channel %s to %d\n", peer->name, peerf);
                return -1;
        }
        /* Now we go the other way */
@@ -913,19 +1571,19 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
        chanf = chan->nativeformats;
        res = ast_translator_best_choice(&chanf, &peerf);
        if (res < 0) {
-               ast_log(LOG_WARNING, "No path to translate from %s(%d) to %s(%d)\n", peer, peer->nativeformats, chan, chan->nativeformats);
+               ast_log(LOG_WARNING, "No path to translate from %s(%d) to %s(%d)\n", peer->name, peer->nativeformats, chan->name, chan->nativeformats);
                return -1;
        }
        /* Set writeformat on channel */
        res = ast_set_write_format(chan, chanf);
        if (res < 0) {
-               ast_log(LOG_WARNING, "Unable to set write format on channel %s to %d\n", chan, chanf);
+               ast_log(LOG_WARNING, "Unable to set write format on channel %s to %d\n", chan->name, chanf);
                return -1;
        }
        /* Set read format on peer channel */
        res = ast_set_read_format(peer, chanf);
        if (res < 0) {
-               ast_log(LOG_WARNING, "Unable to set read format on channel %s to %d\n", peer, peerf);
+               ast_log(LOG_WARNING, "Unable to set read format on channel %s to %d\n", peer->name, peerf);
                return -1;
        }
        return 0;
@@ -933,6 +1591,7 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
 
 int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clone)
 {
+       struct ast_frame null = { AST_FRAME_NULL, };
        ast_log(LOG_DEBUG, "Planning to masquerade %s into the structure of %s\n",
                clone->name, original->name);
        if (original->masq) {
@@ -947,22 +1606,38 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo
        }
        original->masq = clone;
        clone->masqr = original;
+       /* XXX can't really hold the lock here, but at the same time, it' s
+          not really safe not to XXX */
+       ast_queue_frame(original, &null, 0);
        return 0;
 }
 
+void ast_change_name(struct ast_channel *chan, char *newname)
+{
+       char tmp[256];
+       strncpy(tmp, chan->name, 256);
+       strncpy(chan->name, newname, sizeof(chan->name) - 1);
+       manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\n", tmp, chan->name);
+}
+
 static int ast_do_masquerade(struct ast_channel *original)
 {
        int x;
        int res=0;
        char *tmp;
+       void *tmpv;
        struct ast_channel_pvt *p;
        struct ast_channel *clone = original->masq;
        int rformat = original->readformat;
        int wformat = original->writeformat;
+       char newn[100];
+       char orig[100];
+       char masqn[100];
+       char zombn[100];
        
-#if 0
+#if 1
        ast_log(LOG_DEBUG, "Actually Masquerading %s(%d) into the structure of %s(%d)\n",
-               clone->name, clone->state, original->name, original->state);
+               clone->name, clone->_state, original->name, original->_state);
 #endif
        /* XXX This is a seriously wacked out operation.  We're essentially putting the guts of
           the clone channel into the original channel.  Start by killing off the original
@@ -975,24 +1650,35 @@ static int ast_do_masquerade(struct ast_channel *original)
        free_translation(original);
 
        /* We need the clone's lock, too */
-       pthread_mutex_lock(&clone->lock);
+       ast_pthread_mutex_lock(&clone->lock);
 
        /* Unlink the masquerade */
        original->masq = NULL;
        clone->masqr = NULL;
+       
+       /* Save the original name */
+       strncpy(orig, original->name, sizeof(orig) - 1);
+       /* Save the new name */
+       strncpy(newn, clone->name, sizeof(newn) - 1);
+       /* Create the masq name */
+       snprintf(masqn, sizeof(masqn), "%s<MASQ>", newn);
                
        /* Copy the name from the clone channel */
-       strncpy(original->name, clone->name, sizeof(original->name));
+       strncpy(original->name, newn, sizeof(original->name)-1);
 
        /* Mangle the name of the clone channel */
-       strncat(clone->name, "<MASQ>", sizeof(clone->name));
+       strncpy(clone->name, masqn, sizeof(clone->name) - 1);
+       
+       /* Notify any managers of the change, first the masq then the other */
+       manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\n", newn, masqn);
+       manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\n", orig, newn);
 
        /* Swap the guts */     
        p = original->pvt;
        original->pvt = clone->pvt;
        clone->pvt = p;
        
-       clone->softhangup = 1;
+       clone->_softhangup = AST_SOFTHANGUP_DEV;
 
 
        if (clone->pvt->fixup){
@@ -1010,8 +1696,10 @@ static int ast_do_masquerade(struct ast_channel *original)
                return -1;
        }
        
+       snprintf(zombn, sizeof(zombn), "%s<ZOMBIE>", orig);
        /* Mangle the name of the clone channel */
-       snprintf(clone->name, sizeof(clone->name), "%s<ZOMBIE>", original->name);
+       strncpy(clone->name, zombn, sizeof(clone->name) - 1);
+       manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\n", masqn, zombn);
 
        /* Keep the same language.  */
        /* Update the type. */
@@ -1019,6 +1707,12 @@ static int ast_do_masquerade(struct ast_channel *original)
        /* Copy the FD's */
        for (x=0;x<AST_MAX_FDS;x++)
                original->fds[x] = clone->fds[x];
+       /* Move the variables */
+       tmpv = original->varshead.first;
+       original->varshead.first = clone->varshead.first;
+       clone->varshead.first = tmpv;
+       /* Presense of ADSI capable CPE follows clone */
+       original->adsicpe = clone->adsicpe;
        /* Bridge remains the same */
        /* CDR fields remain the same */
        /* XXX What about blocking, softhangup, blocker, and lock and blockproc? XXX */
@@ -1043,6 +1737,11 @@ static int ast_do_masquerade(struct ast_channel *original)
        
        /* Our native formats are different now */
        original->nativeformats = clone->nativeformats;
+
+       /* And of course, so does our current state.  Note we need not
+          call ast_setstate since the event manager doesn't really consider
+          these separate */
+       original->_state = clone->_state;
        
        /* Context, extension, priority, app data, jump table,  remain the same */
        /* pvt switches.  pbx stays the same, as does next */
@@ -1053,6 +1752,7 @@ static int ast_do_masquerade(struct ast_channel *original)
        if (clone->zombie) {
                pthread_mutex_unlock(&clone->lock);
                ast_channel_free(clone);
+               manager_event(EVENT_FLAG_CALL, "Hangup", "Channel: %s\r\n", zombn);
        } else {
                clone->zombie=1;
                pthread_mutex_unlock(&clone->lock);
@@ -1080,8 +1780,52 @@ static int ast_do_masquerade(struct ast_channel *original)
        /* Signal any blocker */
        if (original->blocking)
                pthread_kill(original->blocker, SIGURG);
-       ast_log(LOG_DEBUG, "Done Masquerading %s(%d) into the structure of %s(%d)\n",
-               clone->name, clone->state, original->name, original->state);
+       return 0;
+}
+
+void ast_set_callerid(struct ast_channel *chan, char *callerid, int anitoo)
+{
+       if (chan->callerid)
+               free(chan->callerid);
+       if (anitoo && chan->ani)
+               free(chan->ani);
+       if (callerid) {
+               chan->callerid = strdup(callerid);
+               if (anitoo)
+                       chan->ani = strdup(callerid);
+       } else {
+               chan->callerid = NULL;
+               if (anitoo)
+                       chan->ani = NULL;
+       }
+       if (chan->cdr)
+               ast_cdr_setcid(chan->cdr, chan);
+       manager_event(EVENT_FLAG_CALL, "Newcallerid", 
+                               "Channel: %s\r\n"
+                               "Callerid: %s\r\n",
+                               chan->name, chan->callerid ? 
+                               chan->callerid : "<Unknown>");
+}
+
+int ast_setstate(struct ast_channel *chan, int state)
+{
+       if (chan->_state != state) {
+               int oldstate = chan->_state;
+               chan->_state = state;
+               if (oldstate == AST_STATE_DOWN) {
+                       manager_event(EVENT_FLAG_CALL, "Newchannel",
+                       "Channel: %s\r\n"
+                       "State: %s\r\n"
+                       "Callerid: %s\r\n",
+                       chan->name, ast_state2str(chan->_state), chan->callerid ? chan->callerid : "<unknown>");
+               } else {
+                       manager_event(EVENT_FLAG_CALL, "Newstate", 
+                               "Channel: %s\r\n"
+                               "State: %s\r\n"
+                               "Callerid: %s\r\n",
+                               chan->name, ast_state2str(chan->_state), chan->callerid ? chan->callerid : "<unknown>");
+               }
+       }
        return 0;
 }
 
@@ -1095,8 +1839,9 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
        struct ast_channel *who = NULL;
        int res;
        int nativefailed=0;
+
        /* Stop if we're a zombie or need a soft hangup */
-       if (c0->zombie || c0->softhangup || c1->zombie || c1->softhangup) 
+       if (c0->zombie || ast_check_hangup(c0) || c1->zombie || ast_check_hangup(c1)) 
                return -1;
        if (c0->bridge) {
                ast_log(LOG_WARNING, "%s is already in a bridge with %s\n", 
@@ -1114,20 +1859,32 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
        c1->bridge = c0;
        cs[0] = c0;
        cs[1] = c1;
+       
+       manager_event(EVENT_FLAG_CALL, "Link", 
+                       "Channel1: %s\r\n"
+                       "Channel2: %s\r\n",
+                       c0->name, c1->name);
+
        for (/* ever */;;) {
                /* Stop if we're a zombie or need a soft hangup */
-               if (c0->zombie || c0->softhangup || c1->zombie || c1->softhangup) {
+               if (c0->zombie || ast_check_hangup(c0) || c1->zombie || ast_check_hangup(c1)) {
                        *fo = NULL;
                        if (who) *rc = who;
                        res = 0;
                        break;
                }
                if (c0->pvt->bridge && 
-                       (c0->pvt->bridge == c1->pvt->bridge) && !nativefailed) {
+                       (c0->pvt->bridge == c1->pvt->bridge) && !nativefailed && !c0->monitor && !c1->monitor) {
                                /* Looks like they share a bridge code */
+                       if (option_verbose > 2) 
+                               ast_verbose(VERBOSE_PREFIX_3 "Attempting native bridge of %s and %s\n", c0->name, c1->name);
                        if (!(res = c0->pvt->bridge(c0, c1, flags, fo, rc))) {
                                c0->bridge = NULL;
                                c1->bridge = NULL;
+                               manager_event(EVENT_FLAG_CALL, "Unlink", 
+                                       "Channel1: %s\r\n"
+                                       "Channel2: %s\r\n",
+                                       c0->name, c1->name);
                                return 0;
                        }
                        /* If they return non-zero then continue on normally.  Let "-2" mean don't worry about
@@ -1138,15 +1895,20 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
                }
        
                        
-               if ((c0->writeformat != c1->readformat) || (c0->readformat != c1->writeformat)) {
+               if (((c0->writeformat != c1->readformat) || (c0->readformat != c1->writeformat)) &&
+                       !(c0->generator || c1->generator))  {
                        if (ast_channel_make_compatible(c0, c1)) {
                                ast_log(LOG_WARNING, "Can't make %s and %s compatible\n", c0->name, c1->name);
+                               manager_event(EVENT_FLAG_CALL, "Unlink", 
+                                       "Channel1: %s\r\n"
+                                       "Channel2: %s\r\n",
+                                       c0->name, c1->name);
                                return -1;
                        }
                }
                who = ast_waitfor_n(cs, 2, &to);
                if (!who) {
-                       ast_log(LOG_WARNING, "Nobody there??\n"); 
+                       ast_log(LOG_DEBUG, "Nobody there, continuing...\n"); 
                        continue;
                }
                f = ast_read(who);
@@ -1156,6 +1918,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
                        res = 0;
                        break;
                }
+
                if ((f->frametype == AST_FRAME_CONTROL) && !(flags & AST_BRIDGE_IGNORE_SIGS)) {
                        *fo = f;
                        *rc = who;
@@ -1196,6 +1959,8 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
                                last = who;
 #endif
 tackygoto:
+                               /* Don't copy packets if there is a generator on either one, since they're
+                                  not supposed to be listening anyway */
                                if (who == c0) 
                                        ast_write(c1, f);
                                else 
@@ -1211,6 +1976,10 @@ tackygoto:
        }
        c0->bridge = NULL;
        c1->bridge = NULL;
+       manager_event(EVENT_FLAG_CALL, "Unlink", 
+                                       "Channel1: %s\r\n"
+                                       "Channel2: %s\r\n",
+                                       c0->name, c1->name);
        return res;
 }
 
@@ -1233,3 +2002,137 @@ int ast_channel_setoption(struct ast_channel *chan, int option, void *data, int
        }
        return 0;
 }
+
+struct tonepair_def {
+       int freq1;
+       int freq2;
+       int duration;
+       int vol;
+};
+
+struct tonepair_state {
+       float freq1;
+       float freq2;
+       float vol;
+       int duration;
+       int pos;
+       int origwfmt;
+       struct ast_frame f;
+       unsigned char offset[AST_FRIENDLY_OFFSET];
+       short data[4000];
+};
+
+static void tonepair_release(struct ast_channel *chan, void *params)
+{
+       struct tonepair_state *ts = params;
+       if (chan) {
+               ast_set_write_format(chan, ts->origwfmt);
+       }
+       free(ts);
+}
+
+static void * tonepair_alloc(struct ast_channel *chan, void *params)
+{
+       struct tonepair_state *ts;
+       struct tonepair_def *td = params;
+       ts = malloc(sizeof(struct tonepair_state));
+       if (!ts)
+               return NULL;
+       memset(ts, 0, sizeof(struct tonepair_state));
+       ts->origwfmt = chan->writeformat;
+       if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) {
+               ast_log(LOG_WARNING, "Unable to set '%s' to signed linear format (write)\n", chan->name);
+               tonepair_release(NULL, ts);
+               ts = NULL;
+       } else {
+               ts->freq1 = td->freq1;
+               ts->freq2 = td->freq2;
+               ts->duration = td->duration;
+               ts->vol = td->vol;
+       }
+       /* Let interrupts interrupt :) */
+       chan->writeinterrupt = 1;
+       return ts;
+}
+
+static int tonepair_generator(struct ast_channel *chan, void *data, int len, int samples)
+{
+       struct tonepair_state *ts = data;
+       int x;
+
+       /* we need to prepare a frame with 16 * timelen samples as we're 
+        * generating SLIN audio
+        */
+       len = samples * 2;
+
+       if (len > sizeof(ts->data) / 2 - 1) {
+               ast_log(LOG_WARNING, "Can't generate that much data!\n");
+               return -1;
+       }
+       memset(&ts->f, 0, sizeof(ts->f));
+       for (x=0;x<len/2;x++) {
+               ts->data[x] = ts->vol * (
+                               sin((ts->freq1 * 2.0 * M_PI / 8000.0) * (ts->pos + x)) +
+                               sin((ts->freq2 * 2.0 * M_PI / 8000.0) * (ts->pos + x))
+                       );
+       }
+       ts->f.frametype = AST_FRAME_VOICE;
+       ts->f.subclass = AST_FORMAT_SLINEAR;
+       ts->f.datalen = len;
+       ts->f.samples = samples;
+       ts->f.offset = AST_FRIENDLY_OFFSET;
+       ts->f.data = ts->data;
+       ast_write(chan, &ts->f);
+       ts->pos += x;
+       if (ts->duration > 0) {
+               if (ts->pos >= ts->duration * 8)
+                       return -1;
+       }
+       return 0;
+}
+
+static struct ast_generator tonepair = {
+       alloc: tonepair_alloc,
+       release: tonepair_release,
+       generate: tonepair_generator,
+};
+
+int ast_tonepair_start(struct ast_channel *chan, int freq1, int freq2, int duration, int vol)
+{
+       struct tonepair_def d = { 0, };
+       d.freq1 = freq1;
+       d.freq2 = freq2;
+       d.duration = duration;
+       if (vol < 1)
+               d.vol = 8192;
+       else
+               d.vol = vol;
+       if (ast_activate_generator(chan, &tonepair, &d))
+               return -1;
+       return 0;
+}
+
+void ast_tonepair_stop(struct ast_channel *chan)
+{
+       ast_deactivate_generator(chan);
+}
+
+int ast_tonepair(struct ast_channel *chan, int freq1, int freq2, int duration, int vol)
+{
+       struct ast_frame *f;
+       int res;
+       if ((res = ast_tonepair_start(chan, freq1, freq2, duration, vol)))
+               return res;
+
+       /* Give us some wiggle room */
+       while(chan->generatordata && (ast_waitfor(chan, 100) >= 0)) {
+               f = ast_read(chan);
+               if (f)
+                       ast_frfree(f);
+               else
+                       return -1;
+       }
+       return 0;
+}
+
+