Add a massive set of changes for converting to use the ast_debug() macro.
[asterisk/asterisk.git] / channels / chan_phone.c
old mode 100755 (executable)
new mode 100644 (file)
index 9a6bc9b..e33d1a1
@@ -1,27 +1,41 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Generic Linux Telephony Interface driver
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Generic Linux Telephony Interface driver
+ *
+ * \author Mark Spencer <markster@digium.com>
+ * 
+ * \ingroup channel_drivers
  */
 
+/*** MODULEINFO
+       <depend>ixjuser</depend>
+ ***/
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
-#include <asterisk/lock.h>
-#include <asterisk/channel.h>
-#include <asterisk/channel_pvt.h>
-#include <asterisk/config.h>
-#include <asterisk/logger.h>
-#include <asterisk/module.h>
-#include <asterisk/pbx.h>
-#include <asterisk/options.h>
+#include <ctype.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <signal.h>
 #include <linux/telephony.h>
 /* Still use some IXJ specific stuff */
+#include <linux/version.h>
 #include <linux/ixjuser.h>
+
+#include "asterisk/lock.h"
+#include "asterisk/channel.h"
+#include "asterisk/config.h"
+#include "asterisk/logger.h"
+#include "asterisk/module.h"
+#include "asterisk/pbx.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/callerid.h"
+#include "asterisk/causes.h"
+#include "asterisk/stringfields.h"
+#include "asterisk/musiconhold.h"
+
 #include "DialTone.h"
 
+#ifdef QTI_PHONEJACK_TJ_PCI    /* check for the newer quicknet driver v.3.1.0 which has this symbol */
+#define QNDRV_VER 310
+#else
+#define QNDRV_VER 100
+#endif
+
+#if QNDRV_VER > 100
+#ifdef __linux__
+#define IXJ_PHONE_RING_START(x)        ioctl(p->fd, PHONE_RING_START, &x);
+#else /* FreeBSD and others */
+#define IXJ_PHONE_RING_START(x)        ioctl(p->fd, PHONE_RING_START, x);
+#endif /* __linux__ */
+#else  /* older driver */
+#define IXJ_PHONE_RING_START(x)        ioctl(p->fd, PHONE_RING_START, &x);
+#endif
+
+#define DEFAULT_CALLER_ID "Unknown"
 #define PHONE_MAX_BUF 480
 #define DEFAULT_GAIN 0x100
 
-static char *desc = "Linux Telephony API Support";
-static char *type = "Phone";
-static char *tdesc = "Standard Linux Telephony API Driver";
-static char *config = "phone.conf";
+static const char tdesc[] = "Standard Linux Telephony API Driver";
+static const char config[] = "phone.conf";
 
 /* Default context for dialtone mode */
 static char context[AST_MAX_EXTENSION] = "default";
 
 /* Default language */
 static char language[MAX_LANGUAGE] = "";
-static int usecnt =0;
 
 static int echocancel = AEC_OFF;
 
 static int silencesupression = 0;
 
-static int prefformat = AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW;
-
-static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
+static int prefformat = AST_FORMAT_G729A | AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW;
 
 /* Protect the interface list (of phone_pvt's) */
-static pthread_mutex_t iflock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(iflock);
 
 /* Protect the monitoring thread, so only one process can kill or start it, and not
    when it's doing something critical. */
-static pthread_mutex_t monlock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(monlock);
 
+/* Boolean value whether the monitoring thread shall continue. */
+static unsigned int monitor;
+   
 /* This is the thread for the monitor which checks for input on the channels
    which are not currently in use.  */
-static pthread_t monitor_thread = -1;
+static pthread_t monitor_thread = AST_PTHREADT_NULL;
 
 static int restart_monitor(void);
 
@@ -76,8 +121,10 @@ static int restart_monitor(void);
    
 #define MODE_DIALTONE  1
 #define MODE_IMMEDIATE 2
-#define MODE_FXO               3
-   
+#define MODE_FXO       3
+#define MODE_FXS        4
+#define MODE_SIGMA      5
+
 static struct phone_pvt {
        int fd;                                                 /* Raw file descriptor for this device */
        struct ast_channel *owner;              /* Channel we belong to, possibly NULL */
@@ -100,16 +147,108 @@ static struct phone_pvt {
        char obuf[PHONE_MAX_BUF * 2];
        char ext[AST_MAX_EXTENSION];
        char language[MAX_LANGUAGE];
-       char callerid[AST_MAX_EXTENSION];
+       char cid_num[AST_MAX_EXTENSION];
+       char cid_name[AST_MAX_EXTENSION];
 } *iflist = NULL;
 
-static char callerid[AST_MAX_EXTENSION];
+static char cid_num[AST_MAX_EXTENSION];
+static char cid_name[AST_MAX_EXTENSION];
+
+static struct ast_channel *phone_request(const char *type, int format, void *data, int *cause);
+static int phone_digit_begin(struct ast_channel *ast, char digit);
+static int phone_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
+static int phone_call(struct ast_channel *ast, char *dest, int timeout);
+static int phone_hangup(struct ast_channel *ast);
+static int phone_answer(struct ast_channel *ast);
+static struct ast_frame *phone_read(struct ast_channel *ast);
+static int phone_write(struct ast_channel *ast, struct ast_frame *frame);
+static struct ast_frame *phone_exception(struct ast_channel *ast);
+static int phone_send_text(struct ast_channel *ast, const char *text);
+static int phone_fixup(struct ast_channel *old, struct ast_channel *new);
+static int phone_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen);
+
+static const struct ast_channel_tech phone_tech = {
+       .type = "Phone",
+       .description = tdesc,
+       .capabilities = AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW | AST_FORMAT_G729A,
+       .requester = phone_request,
+       .send_digit_begin = phone_digit_begin,
+       .send_digit_end = phone_digit_end,
+       .call = phone_call,
+       .hangup = phone_hangup,
+       .answer = phone_answer,
+       .read = phone_read,
+       .write = phone_write,
+       .exception = phone_exception,
+       .indicate = phone_indicate,
+       .fixup = phone_fixup
+};
+
+static struct ast_channel_tech phone_tech_fxs = {
+       .type = "Phone",
+       .description = tdesc,
+       .requester = phone_request,
+       .send_digit_begin = phone_digit_begin,
+       .send_digit_end = phone_digit_end,
+       .call = phone_call,
+       .hangup = phone_hangup,
+       .answer = phone_answer,
+       .read = phone_read,
+       .write = phone_write,
+       .exception = phone_exception,
+       .write_video = phone_write,
+       .send_text = phone_send_text,
+       .indicate = phone_indicate,
+       .fixup = phone_fixup
+};
+
+static struct ast_channel_tech *cur_tech;
+
+static int phone_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen)
+{
+       struct phone_pvt *p = chan->tech_pvt;
+       int res=-1;
+       ast_debug(1, "Requested indication %d on channel %s\n", condition, chan->name);
+       switch(condition) {
+               case AST_CONTROL_FLASH:
+                       ioctl(p->fd, IXJCTL_PSTN_SET_STATE, PSTN_ON_HOOK);
+                       usleep(320000);
+                       ioctl(p->fd, IXJCTL_PSTN_SET_STATE, PSTN_OFF_HOOK);
+                       p->lastformat = -1;
+                       res = 0;
+                       break;
+               case AST_CONTROL_HOLD:
+                       ast_moh_start(chan, data, NULL);
+                       break;
+               case AST_CONTROL_UNHOLD:
+                       ast_moh_stop(chan);
+                       break;
+               default:
+                       ast_log(LOG_WARNING, "Condition %d is not supported on channel %s\n", condition, chan->name);
+       }
+       return res;
+}
+
+static int phone_fixup(struct ast_channel *old, struct ast_channel *new)
+{
+       struct phone_pvt *pvt = old->tech_pvt;
+       if (pvt && pvt->owner == old)
+               pvt->owner = new;
+       return 0;
+}
 
-static int phone_digit(struct ast_channel *ast, char digit)
+static int phone_digit_begin(struct ast_channel *chan, char digit)
+{
+       /* XXX Modify this callback to let Asterisk support controlling the length of DTMF */
+       return 0;
+}
+
+static int phone_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
 {
        struct phone_pvt *p;
        int outdigit;
-       p = ast->pvt->pvt;
+       p = ast->tech_pvt;
+       ast_debug(1, "Dialed %c\n", digit);
        switch(digit) {
        case '0':
        case '1':
@@ -121,7 +260,7 @@ static int phone_digit(struct ast_channel *ast, char digit)
        case '7':
        case '8':
        case '9':
-               outdigit = digit - '0' + 1;
+               outdigit = digit - '0';
                break;
        case '*':
                outdigit = 11;
@@ -129,11 +268,19 @@ static int phone_digit(struct ast_channel *ast, char digit)
        case '#':
                outdigit = 12;
                break;
+       case 'f':       /*flash*/
+       case 'F':
+               ioctl(p->fd, IXJCTL_PSTN_SET_STATE, PSTN_ON_HOOK);
+               usleep(320000);
+               ioctl(p->fd, IXJCTL_PSTN_SET_STATE, PSTN_OFF_HOOK);
+               p->lastformat = -1;
+               return 0;
        default:
                ast_log(LOG_WARNING, "Unknown digit '%c'\n", digit);
                return -1;
        }
-       ioctl(p->fd, PHONE_PLAY_TONE, digit);
+       ast_debug(1, "Dialed %d\n", outdigit);
+       ioctl(p->fd, PHONE_PLAY_TONE, outdigit);
        p->lastformat = -1;
        return 0;
 }
@@ -142,51 +289,63 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
 {
        struct phone_pvt *p;
 
-       // CID stuff for the phonejack...
-
        PHONE_CID cid;
        time_t UtcTime;
-       struct tm *t;
-
+       struct tm tm;
+       int start;
 
-       if (ast->callerid) {
-               time(&UtcTime);
-               t = localtime(&UtcTime);
+       time(&UtcTime);
+       localtime_r(&UtcTime,&tm);
 
-               if(t != NULL) {
-                       sprintf(cid.month, "%02d",(t->tm_mon + 1));
-                       sprintf(cid.day, "%02d", t->tm_mday);
-                       sprintf(cid.hour, "%02d", t->tm_hour);
-                       sprintf(cid.min, "%02d", t->tm_min);
-               }
-               strcpy(cid.name, "Unknown");
-               sprintf(cid.number,"%s",ast->callerid);
+       memset(&cid, 0, sizeof(PHONE_CID));
+       if(&tm != NULL) {
+               snprintf(cid.month, sizeof(cid.month), "%02d",(tm.tm_mon + 1));
+               snprintf(cid.day, sizeof(cid.day),     "%02d", tm.tm_mday);
+               snprintf(cid.hour, sizeof(cid.hour),   "%02d", tm.tm_hour);
+               snprintf(cid.min, sizeof(cid.min),     "%02d", tm.tm_min);
        }
+       /* the standard format of ast->callerid is:  "name" <number>, but not always complete */
+       if (ast_strlen_zero(ast->cid.cid_name))
+               strcpy(cid.name, DEFAULT_CALLER_ID);
+       else
+               ast_copy_string(cid.name, ast->cid.cid_name, sizeof(cid.name));
+
+       if (ast->cid.cid_num) 
+               ast_copy_string(cid.number, ast->cid.cid_num, sizeof(cid.number));
 
-       p = ast->pvt->pvt;
+       p = ast->tech_pvt;
 
        if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED)) {
                ast_log(LOG_WARNING, "phone_call called on %s, neither down nor reserved\n", ast->name);
                return -1;
        }
-       /* When we call, it just works, really, there's no destination...  Just
-          ring the phone and wait for someone to answer */
-       if (option_debug)
-               ast_log(LOG_DEBUG, "Ringing %s on %s (%d)\n", dest, ast->name, ast->fds[0]);
-
-       ioctl(p->fd, PHONE_RING_START,&cid);
-       ast_setstate(ast, AST_STATE_RINGING);
-       ast_queue_control(ast, AST_CONTROL_RINGING, 0);
+       ast_debug(1, "Ringing %s on %s (%d)\n", dest, ast->name, ast->fds[0]);
+
+       start = IXJ_PHONE_RING_START(cid);
+       if (start == -1)
+               return -1;
+       
+       if (p->mode == MODE_FXS) {
+               char *digit = strchr(dest, '/');
+               if (digit)
+               {
+                 digit++;
+                 while (*digit)
+                   phone_digit_end(ast, *digit++, 0);
+               }
+       }
+       ast_setstate(ast, AST_STATE_RINGING);
+       ast_queue_control(ast, AST_CONTROL_RINGING);
        return 0;
 }
 
 static int phone_hangup(struct ast_channel *ast)
 {
        struct phone_pvt *p;
-       p = ast->pvt->pvt;
-       if (option_debug)
-               ast_log(LOG_DEBUG, "phone_hangup(%s)\n", ast->name);
-       if (!ast->pvt->pvt) {
+       p = ast->tech_pvt;
+       ast_debug(1, "phone_hangup(%s)\n", ast->name);
+       if (!ast->tech_pvt) {
                ast_log(LOG_WARNING, "Asked to hangup channel not connected\n");
                return 0;
        }
@@ -203,14 +362,13 @@ static int phone_hangup(struct ast_channel *ast)
 
        /* If it's an FXO, hang them up */
        if (p->mode == MODE_FXO) {
-               if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) 
-                       ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",ast->name, strerror(errno));
+               if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK))
+                       ast_debug(1, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",ast->name, strerror(errno));
        }
 
        /* If they're off hook, give a busy signal */
        if (ioctl(p->fd, PHONE_HOOKSTATE)) {
-               if (option_debug)
-                       ast_log(LOG_DEBUG, "Got hunghup, giving busy signal\n");
+               ast_debug(1, "Got hunghup, giving busy signal\n");
                ioctl(p->fd, PHONE_BUSY);
                p->cpt = 1;
        }
@@ -220,16 +378,11 @@ static int phone_hangup(struct ast_channel *ast)
        p->obuflen = 0;
        p->dialtone = 0;
        memset(p->ext, 0, sizeof(p->ext));
-       ((struct phone_pvt *)(ast->pvt->pvt))->owner = NULL;
-       ast_pthread_mutex_lock(&usecnt_lock);
-       usecnt--;
-       if (usecnt < 0) 
-               ast_log(LOG_WARNING, "Usecnt < 0???\n");
-       ast_pthread_mutex_unlock(&usecnt_lock);
-       ast_update_use_count();
+       ((struct phone_pvt *)(ast->tech_pvt))->owner = NULL;
+       ast_module_unref(ast_module_info->self);
        if (option_verbose > 2) 
                ast_verbose( VERBOSE_PREFIX_3 "Hungup '%s'\n", ast->name);
-       ast->pvt->pvt = NULL;
+       ast->tech_pvt = NULL;
        ast_setstate(ast, AST_STATE_DOWN);
        restart_monitor();
        return 0;
@@ -238,11 +391,20 @@ static int phone_hangup(struct ast_channel *ast)
 static int phone_setup(struct ast_channel *ast)
 {
        struct phone_pvt *p;
-       p = ast->pvt->pvt;
+       p = ast->tech_pvt;
        ioctl(p->fd, PHONE_CPT_STOP);
        /* Nothing to answering really, just start recording */
-       if (ast->pvt->rawreadformat == AST_FORMAT_G723_1) {
-               /* Prefer g723 */
+       if (ast->rawreadformat == AST_FORMAT_G729A) {
+               /* Prefer g729 */
+               ioctl(p->fd, PHONE_REC_STOP);
+               if (p->lastinput != AST_FORMAT_G729A) {
+                       p->lastinput = AST_FORMAT_G729A;
+                       if (ioctl(p->fd, PHONE_REC_CODEC, G729)) {
+                               ast_log(LOG_WARNING, "Failed to set codec to g729\n");
+                               return -1;
+                       }
+               }
+        } else if (ast->rawreadformat == AST_FORMAT_G723_1) {
                ioctl(p->fd, PHONE_REC_STOP);
                if (p->lastinput != AST_FORMAT_G723_1) {
                        p->lastinput = AST_FORMAT_G723_1;
@@ -251,7 +413,7 @@ static int phone_setup(struct ast_channel *ast)
                                return -1;
                        }
                }
-       } else if (ast->pvt->rawreadformat == AST_FORMAT_SLINEAR) {
+       } else if (ast->rawreadformat == AST_FORMAT_SLINEAR) {
                ioctl(p->fd, PHONE_REC_STOP);
                if (p->lastinput != AST_FORMAT_SLINEAR) {
                        p->lastinput = AST_FORMAT_SLINEAR;
@@ -260,45 +422,58 @@ static int phone_setup(struct ast_channel *ast)
                                return -1;
                        }
                }
-       } else if (ast->pvt->rawreadformat == AST_FORMAT_ULAW) {
+       } else if (ast->rawreadformat == AST_FORMAT_ULAW) {
                ioctl(p->fd, PHONE_REC_STOP);
                if (p->lastinput != AST_FORMAT_ULAW) {
                        p->lastinput = AST_FORMAT_ULAW;
                        if (ioctl(p->fd, PHONE_REC_CODEC, ULAW)) {
-                               ast_log(LOG_WARNING, "Failed to set codec to signed linear 16\n");
+                               ast_log(LOG_WARNING, "Failed to set codec to uLaw\n");
+                               return -1;
+                       }
+               }
+       } else if (p->mode == MODE_FXS) {
+               ioctl(p->fd, PHONE_REC_STOP);
+               if (p->lastinput != ast->rawreadformat) {
+                       p->lastinput = ast->rawreadformat;
+                       if (ioctl(p->fd, PHONE_REC_CODEC, ast->rawreadformat)) {
+                               ast_log(LOG_WARNING, "Failed to set codec to %d\n", 
+                                       ast->rawreadformat);
                                return -1;
                        }
                }
        } else {
-               ast_log(LOG_WARNING, "Can't do format %d\n", ast->pvt->rawreadformat);
+               ast_log(LOG_WARNING, "Can't do format %s\n", ast_getformatname(ast->rawreadformat));
                return -1;
        }
        if (ioctl(p->fd, PHONE_REC_START)) {
                ast_log(LOG_WARNING, "Failed to start recording\n");
                return -1;
        }
+       /* set the DTMF times (the default is too short) */
+       ioctl(p->fd, PHONE_SET_TONE_ON_TIME, 300);
+       ioctl(p->fd, PHONE_SET_TONE_OFF_TIME, 200);
        return 0;
 }
 
 static int phone_answer(struct ast_channel *ast)
 {
        struct phone_pvt *p;
-       p = ast->pvt->pvt;
+       p = ast->tech_pvt;
        /* In case it's a LineJack, take it off hook */
        if (p->mode == MODE_FXO) {
-               if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_OFF_HOOK)) 
-                       ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n", ast->name, strerror(errno));
+               if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_OFF_HOOK))
+                       ast_debug(1, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n", ast->name, strerror(errno));
                else
-                       ast_log(LOG_DEBUG, "Took linejack off hook\n");
+                       ast_debug(1, "Took linejack off hook\n");
        }
        phone_setup(ast);
-       if (option_debug)
-               ast_log(LOG_DEBUG, "phone_answer(%s)\n", ast->name);
+       ast_debug(1, "phone_answer(%s)\n", ast->name);
        ast->rings = 0;
        ast_setstate(ast, AST_STATE_UP);
        return 0;
 }
 
+#if 0
 static char phone_2digit(char c)
 {
        if (c == 12)
@@ -310,26 +485,27 @@ static char phone_2digit(char c)
        else
                return '?';
 }
+#endif
 
 static struct ast_frame  *phone_exception(struct ast_channel *ast)
 {
        int res;
        union telephony_exception phonee;
-       struct phone_pvt *p = ast->pvt->pvt;
+       struct phone_pvt *p = ast->tech_pvt;
        char digit;
 
        /* Some nice norms */
        p->fr.datalen = 0;
        p->fr.samples = 0;
        p->fr.data =  NULL;
-       p->fr.src = type;
+       p->fr.src = "Phone";
        p->fr.offset = 0;
        p->fr.mallocd=0;
-
+       p->fr.delivery = ast_tv(0,0);
+       
        phonee.bytes = ioctl(p->fd, PHONE_EXCEPTION);
        if (phonee.bits.dtmf_ready)  {
-               if (option_debug)
-                       ast_log(LOG_DEBUG, "phone_exception(): DTMF\n");
+               ast_debug(1, "phone_exception(): DTMF\n");
        
                /* We've got a digit -- Just handle this nicely and easily */
                digit =  ioctl(p->fd, PHONE_GET_DTMF_ASCII);
@@ -338,12 +514,10 @@ static struct ast_frame  *phone_exception(struct ast_channel *ast)
                return &p->fr;
        }
        if (phonee.bits.hookstate) {
-               if (option_debug)
-                       ast_log(LOG_DEBUG, "Hookstate changed\n");
+               ast_debug(1, "Hookstate changed\n");
                res = ioctl(p->fd, PHONE_HOOKSTATE);
                /* See if we've gone on hook, if so, notify by returning NULL */
-               if (option_debug)
-                       ast_log(LOG_DEBUG, "New hookstate: %d\n", res);
+               ast_debug(1, "New hookstate: %d\n", res);
                if (!res && (p->mode != MODE_FXO))
                        return NULL;
                else {
@@ -376,21 +550,22 @@ static struct ast_frame  *phone_exception(struct ast_channel *ast)
 static struct ast_frame  *phone_read(struct ast_channel *ast)
 {
        int res;
-       struct phone_pvt *p = ast->pvt->pvt;
+       struct phone_pvt *p = ast->tech_pvt;
        
 
        /* Some nice norms */
        p->fr.datalen = 0;
        p->fr.samples = 0;
        p->fr.data =  NULL;
-       p->fr.src = type;
+       p->fr.src = "Phone";
        p->fr.offset = 0;
        p->fr.mallocd=0;
+       p->fr.delivery = ast_tv(0,0);
 
        /* Try to read some data... */
        CHECK_BLOCKING(ast);
        res = read(p->fd, p->buf, PHONE_MAX_BUF);
-       ast->blocking = 0;
+       ast_clear_flag(ast, AST_FLAG_BLOCKING);
        if (res < 0) {
 #if 0
                if (errno == EAGAIN) {
@@ -404,6 +579,7 @@ static struct ast_frame  *phone_read(struct ast_channel *ast)
                return NULL;
        }
        p->fr.data = p->buf;
+       if (p->mode != MODE_FXS)
        switch(p->buf[0] & 0x3) {
        case '0':
        case '1':
@@ -417,13 +593,19 @@ static struct ast_frame  *phone_read(struct ast_channel *ast)
        }
        p->fr.samples = 240;
        p->fr.datalen = res;
-       p->fr.frametype = AST_FRAME_VOICE;
+       p->fr.frametype = p->lastinput <= AST_FORMAT_MAX_AUDIO ?
+                          AST_FRAME_VOICE : 
+                         p->lastinput <= AST_FORMAT_PNG ? AST_FRAME_IMAGE 
+                         : AST_FRAME_VIDEO;
        p->fr.subclass = p->lastinput;
        p->fr.offset = AST_FRIENDLY_OFFSET;
+       /* Byteswap from little-endian to native-endian */
+       if (p->fr.subclass == AST_FORMAT_SLINEAR)
+               ast_frame_byteswap_le(&p->fr);
        return &p->fr;
 }
 
-static int phone_write_buf(struct phone_pvt *p, char *buf, int len, int frlen)
+static int phone_write_buf(struct phone_pvt *p, const char *buf, int len, int frlen, int swap)
 {
        int res;
        /* Store as much of the buffer as we can, then write fixed frames */
@@ -431,7 +613,10 @@ static int phone_write_buf(struct phone_pvt *p, char *buf, int len, int frlen)
        /* Make sure we have enough buffer space to store the frame */
        if (space < len)
                len = space;
-       memcpy(p->obuf + p->obuflen, buf, len);
+       if (swap)
+               ast_swapcopy_samples(p->obuf+p->obuflen, buf, len/2);
+       else
+               memcpy(p->obuf + p->obuflen, buf, len);
        p->obuflen += len;
        while(p->obuflen > frlen) {
                res = write(p->fd, p->obuf, frlen);
@@ -454,9 +639,16 @@ static int phone_write_buf(struct phone_pvt *p, char *buf, int len, int frlen)
        return len;
 }
 
+static int phone_send_text(struct ast_channel *ast, const char *text)
+{
+    int length = strlen(text);
+    return phone_write_buf(ast->tech_pvt, text, length, length, 0) == 
+           length ? 0 : -1;
+}
+
 static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
 {
-       struct phone_pvt *p = ast->pvt->pvt;
+       struct phone_pvt *p = ast->tech_pvt;
        int res;
        int maxfr=0;
        char *pos;
@@ -465,13 +657,14 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
        int codecset = 0;
        char tmpbuf[4];
        /* Write a frame of (presumably voice) data */
-       if (frame->frametype != AST_FRAME_VOICE) {
+       if (frame->frametype != AST_FRAME_VOICE && p->mode != MODE_FXS) {
                if (frame->frametype != AST_FRAME_IMAGE)
                        ast_log(LOG_WARNING, "Don't know what to do with  frame type '%d'\n", frame->frametype);
                return 0;
        }
        if (!(frame->subclass &
-               (AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW))) {
+               (AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW | AST_FORMAT_G729A)) && 
+           p->mode != MODE_FXS) {
                ast_log(LOG_WARNING, "Cannot handle frames in %d format\n", frame->subclass);
                return -1;
        }
@@ -487,7 +680,30 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
                return 0;
        }
 #endif 
-       if (frame->subclass == AST_FORMAT_G723_1) {
+       if (frame->subclass == AST_FORMAT_G729A) {
+               if (p->lastformat != AST_FORMAT_G729A) {
+                       ioctl(p->fd, PHONE_PLAY_STOP);
+                       ioctl(p->fd, PHONE_REC_STOP);
+                       if (ioctl(p->fd, PHONE_PLAY_CODEC, G729)) {
+                               ast_log(LOG_WARNING, "Unable to set G729 mode\n");
+                               return -1;
+                       }
+                       if (ioctl(p->fd, PHONE_REC_CODEC, G729)) {
+                               ast_log(LOG_WARNING, "Unable to set G729 mode\n");
+                               return -1;
+                       }
+                       p->lastformat = AST_FORMAT_G729A;
+                       p->lastinput = AST_FORMAT_G729A;
+                       /* Reset output buffer */
+                       p->obuflen = 0;
+                       codecset = 1;
+               }
+               if (frame->datalen > 80) {
+                       ast_log(LOG_WARNING, "Frame size too large for G.729 (%d bytes)\n", frame->datalen);
+                       return -1;
+               }
+               maxfr = 80;
+        } else if (frame->subclass == AST_FORMAT_G723_1) {
                if (p->lastformat != AST_FORMAT_G723_1) {
                        ioctl(p->fd, PHONE_PLAY_STOP);
                        ioctl(p->fd, PHONE_REC_STOP);
@@ -548,8 +764,29 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
                        p->obuflen = 0;
                }
                maxfr = 240;
+       } else {
+               if (p->lastformat != frame->subclass) {
+                       ioctl(p->fd, PHONE_PLAY_STOP);
+                       ioctl(p->fd, PHONE_REC_STOP);
+                       if (ioctl(p->fd, PHONE_PLAY_CODEC, frame->subclass)) {
+                               ast_log(LOG_WARNING, "Unable to set %d mode\n",
+                                       frame->subclass);
+                               return -1;
+                       }
+                       if (ioctl(p->fd, PHONE_REC_CODEC, frame->subclass)) {
+                               ast_log(LOG_WARNING, "Unable to set %d mode\n",
+                                       frame->subclass);
+                               return -1;
+                       }
+                       p->lastformat = frame->subclass;
+                       p->lastinput = frame->subclass;
+                       codecset = 1;
+                       /* Reset output buffer */
+                       p->obuflen = 0;
+               }
+               maxfr = 480;
        }
-       if (codecset) {
+       if (codecset) {
                ioctl(p->fd, PHONE_REC_DEPTH, 3);
                ioctl(p->fd, PHONE_PLAY_DEPTH, 3);
                if (ioctl(p->fd, PHONE_PLAY_START)) {
@@ -561,7 +798,7 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
                        return -1;
                }
        }
-       /* If we get here, we have a voice frame of Appropriate data */
+       /* If we get here, we have a frame of Appropriate data */
        sofar = 0;
        pos = frame->data;
        while(sofar < frame->datalen) {
@@ -576,15 +813,20 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
                                memset(tmpbuf + 4, 0, sizeof(tmpbuf) - 4);
                                memcpy(tmpbuf, frame->data, 4);
                                expected = 24;
-                               res = phone_write_buf(p, tmpbuf, expected, maxfr);
+                               res = phone_write_buf(p, tmpbuf, expected, maxfr, 0);
                        }
                        res = 4;
                        expected=4;
                } else {
-                       res = phone_write_buf(p, pos, expected, maxfr);
+                       int swap = 0;
+#if __BYTE_ORDER == __BIG_ENDIAN
+                       if (frame->subclass == AST_FORMAT_SLINEAR)
+                               swap = 1; /* Swap big-endian samples to little-endian as we copy */
+#endif
+                       res = phone_write_buf(p, pos, expected, maxfr, swap);
                }
                if (res != expected) {
-                       if (errno != EAGAIN) {
+                       if ((errno != EAGAIN) && (errno != EINTR)) {
                                if (res < 0) 
                                        ast_log(LOG_WARNING, "Write returned error (%s)\n", strerror(errno));
        /*
@@ -608,40 +850,51 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
 static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *context)
 {
        struct ast_channel *tmp;
-       tmp = ast_channel_alloc(1);
+       struct phone_codec_data codec;
+       tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, "", i->ext, i->context, 0, "Phone/%s", i->dev + 5);
        if (tmp) {
-               snprintf(tmp->name, sizeof(tmp->name), "Phone/%s", i->dev + 5);
-               tmp->type = type;
+               tmp->tech = cur_tech;
                tmp->fds[0] = i->fd;
                /* XXX Switching formats silently causes kernel panics XXX */
-               tmp->nativeformats = prefformat;
-               tmp->pvt->rawreadformat = prefformat;
-               tmp->pvt->rawwriteformat = prefformat;
-               ast_setstate(tmp, state);
+               if (i->mode == MODE_FXS &&
+                   ioctl(i->fd, PHONE_QUERY_CODEC, &codec) == 0) {
+                       if (codec.type == LINEAR16)
+                               tmp->nativeformats =
+                               tmp->rawreadformat =
+                               tmp->rawwriteformat =
+                               AST_FORMAT_SLINEAR;
+                       else {
+                               tmp->nativeformats =
+                               tmp->rawreadformat =
+                               tmp->rawwriteformat =
+                               prefformat & ~AST_FORMAT_SLINEAR;
+                       }
+               }
+               else {
+                       tmp->nativeformats = prefformat;
+                       tmp->rawreadformat = prefformat;
+                       tmp->rawwriteformat = prefformat;
+               }
+               /* no need to call ast_setstate: the channel_alloc already did its job */
                if (state == AST_STATE_RING)
                        tmp->rings = 1;
-               tmp->pvt->pvt = i;
-               tmp->pvt->send_digit = phone_digit;
-               tmp->pvt->call = phone_call;
-               tmp->pvt->hangup = phone_hangup;
-               tmp->pvt->answer = phone_answer;
-               tmp->pvt->read = phone_read;
-               tmp->pvt->write = phone_write;
-               tmp->pvt->exception = phone_exception;
-               strncpy(tmp->context, context, sizeof(tmp->context)-1);
-               if (strlen(i->ext))
-                       strncpy(tmp->exten, i->ext, sizeof(tmp->exten)-1);
+               tmp->tech_pvt = i;
+               ast_copy_string(tmp->context, context, sizeof(tmp->context));
+               if (!ast_strlen_zero(i->ext))
+                       ast_copy_string(tmp->exten, i->ext, sizeof(tmp->exten));
                else
-                       strncpy(tmp->exten, "s",  sizeof(tmp->exten) - 1);
-               if (strlen(i->language))
-                       strncpy(tmp->language, i->language, sizeof(tmp->language)-1);
-               if (strlen(i->callerid))
-                       tmp->callerid = strdup(i->callerid);
+                       strcpy(tmp->exten, "s");
+               if (!ast_strlen_zero(i->language))
+                       ast_string_field_set(tmp, language, i->language);
+
+               /* Don't use ast_set_callerid() here because it will
+                * generate a NewCallerID event before the NewChannel event */
+               tmp->cid.cid_num = ast_strdup(i->cid_num);
+               tmp->cid.cid_ani = ast_strdup(i->cid_num);
+               tmp->cid.cid_name = ast_strdup(i->cid_name);
+
                i->owner = tmp;
-               ast_pthread_mutex_lock(&usecnt_lock);
-               usecnt++;
-               ast_pthread_mutex_unlock(&usecnt_lock);
-               ast_update_use_count();
+               ast_module_ref(ast_module_info->self);
                if (state != AST_STATE_DOWN) {
                        if (state == AST_STATE_RING) {
                                ioctl(tmp->fds[0], PHONE_RINGBACK);
@@ -664,7 +917,7 @@ static void phone_mini_packet(struct phone_pvt *i)
        /* Ignore stuff we read... */
        res = read(i->fd, buf, sizeof(buf));
        if (res < 1) {
-               ast_log(LOG_WARNING, "Read returned %d\n", res);
+               ast_log(LOG_WARNING, "Read returned %d: %s\n", res, strerror(errno));
                return;
        }
 }
@@ -676,45 +929,35 @@ static void phone_check_exception(struct phone_pvt *i)
        union telephony_exception phonee;
        /* XXX Do something XXX */
 #if 0
-       ast_log(LOG_DEBUG, "Exception!\n");
+       ast_debug(1, "Exception!\n");
 #endif
        phonee.bytes = ioctl(i->fd, PHONE_EXCEPTION);
        if (phonee.bits.dtmf_ready)  {
                digit[0] = ioctl(i->fd, PHONE_GET_DTMF_ASCII);
-               if (i->mode == MODE_DIALTONE) {
+               if (i->mode == MODE_DIALTONE || i->mode == MODE_FXS || i->mode == MODE_SIGMA) {
                        ioctl(i->fd, PHONE_PLAY_STOP);
                        ioctl(i->fd, PHONE_REC_STOP);
                        ioctl(i->fd, PHONE_CPT_STOP);
                        i->dialtone = 0;
                        if (strlen(i->ext) < AST_MAX_EXTENSION - 1)
-                               strcat(i->ext, digit);
-                       if (ast_exists_extension(NULL, i->context, i->ext, 1, i->callerid)) {
+                               strncat(i->ext, digit, sizeof(i->ext) - strlen(i->ext) - 1);
+                       if ((i->mode != MODE_FXS ||
+                            !(phonee.bytes = ioctl(i->fd, PHONE_EXCEPTION)) ||
+                            !phonee.bits.dtmf_ready) &&
+                           ast_exists_extension(NULL, i->context, i->ext, 1, i->cid_num)) {
                                /* It's a valid extension in its context, get moving! */
                                phone_new(i, AST_STATE_RING, i->context);
                                /* No need to restart monitor, we are the monitor */
-                               if (i->owner) {
-                                       ast_pthread_mutex_lock(&usecnt_lock);
-                                       usecnt--;
-                                       ast_pthread_mutex_unlock(&usecnt_lock);
-                                       ast_update_use_count();
-                               }
-                       } else if (!ast_canmatch_extension(NULL, i->context, i->ext, 1, i->callerid)) {
+                       } else if (!ast_canmatch_extension(NULL, i->context, i->ext, 1, i->cid_num)) {
                                /* There is nothing in the specified extension that can match anymore.
                                   Try the default */
-                               if (ast_exists_extension(NULL, "default", i->ext, 1, i->callerid)) {
+                               if (ast_exists_extension(NULL, "default", i->ext, 1, i->cid_num)) {
                                        /* Check the default, too... */
                                        phone_new(i, AST_STATE_RING, "default");
-                                       if (i->owner) {
-                                               ast_pthread_mutex_lock(&usecnt_lock);
-                                               usecnt--;
-                                               ast_pthread_mutex_unlock(&usecnt_lock);
-                                               ast_update_use_count();
-                                       }
                                        /* XXX This should probably be justified better XXX */
-                               }  else if (!ast_canmatch_extension(NULL, "default", i->ext, 1, i->callerid)) {
+                               }  else if (!ast_canmatch_extension(NULL, "default", i->ext, 1, i->cid_num)) {
                                        /* It's not a valid extension, give a busy signal */
-                                       if (option_debug)
-                                               ast_log(LOG_DEBUG, "%s can't match anything in %s or default\n", i->ext, i->context);
+                                       ast_debug(1, "%s can't match anything in %s or default\n", i->ext, i->context);
                                        ioctl(i->fd, PHONE_BUSY);
                                        i->cpt = 1;
                                }
@@ -730,10 +973,7 @@ static void phone_check_exception(struct phone_pvt *i)
                        if (i->mode == MODE_IMMEDIATE) {
                                phone_new(i, AST_STATE_RING, i->context);
                        } else if (i->mode == MODE_DIALTONE) {
-                               ast_pthread_mutex_lock(&usecnt_lock);
-                               usecnt++;
-                               ast_pthread_mutex_unlock(&usecnt_lock);
-                               ast_update_use_count();
+                               ast_module_ref(ast_module_info->self);
                                /* Reset the extension */
                                i->ext[0] = '\0';
                                /* Play the dialtone */
@@ -742,14 +982,17 @@ static void phone_check_exception(struct phone_pvt *i)
                                ioctl(i->fd, PHONE_PLAY_CODEC, ULAW);
                                ioctl(i->fd, PHONE_PLAY_START);
                                i->lastformat = -1;
+                       } else if (i->mode == MODE_SIGMA) {
+                               ast_module_ref(ast_module_info->self);
+                               /* Reset the extension */
+                               i->ext[0] = '\0';
+                               /* Play the dialtone */
+                               i->dialtone++;
+                               ioctl(i->fd, PHONE_DIALTONE);
                        }
                } else {
-                       if (i->dialtone) {
-                               ast_pthread_mutex_lock(&usecnt_lock);
-                               usecnt--;
-                               ast_pthread_mutex_unlock(&usecnt_lock);
-                               ast_update_use_count();
-                       }
+                       if (i->dialtone)
+                               ast_module_unref(ast_module_info->self);
                        memset(i->ext, 0, sizeof(i->ext));
                        if (i->cpt)
                        {
@@ -783,22 +1026,12 @@ static void *do_monitor(void *data)
        int dotone;
        /* This thread monitors all the frame relay interfaces which are not yet in use
           (and thus do not have a separate thread) indefinitely */
-       /* From here on out, we die whenever asked */
-       if (pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL)) {
-               ast_log(LOG_WARNING, "Unable to set cancel type to asynchronous\n");
-               return NULL;
-       }
-       for(;;) {
+       while (monitor) {
                /* Don't let anybody kill us right away.  Nobody should lock the interface list
                   and wait for the monitor list, but the other way around is okay. */
-               if (ast_pthread_mutex_lock(&monlock)) {
-                       ast_log(LOG_ERROR, "Unable to grab monitor lock\n");
-                       return NULL;
-               }
                /* Lock the interface list */
-               if (ast_pthread_mutex_lock(&iflock)) {
+               if (ast_mutex_lock(&iflock)) {
                        ast_log(LOG_ERROR, "Unable to grab interface lock\n");
-                       ast_pthread_mutex_unlock(&monlock);
                        return NULL;
                }
                /* Build the stuff we're going to select on, that is the socket of every
@@ -808,7 +1041,7 @@ static void *do_monitor(void *data)
                FD_ZERO(&efds);
                i = iflist;
                dotone = 0;
-               while(i) {
+               while (i) {
                        if (FD_ISSET(i->fd, &rfds)) 
                                ast_log(LOG_WARNING, "Descriptor %d appears twice (%s)?\n", i->fd, i->dev);
                        if (!i->owner) {
@@ -817,10 +1050,10 @@ static void *do_monitor(void *data)
                                FD_SET(i->fd, &efds);
                                if (i->fd > n)
                                        n = i->fd;
-                               if (i->dialtone) {
+                               if (i->dialtone && i->mode != MODE_SIGMA) {
                                        /* Remember we're going to have to come back and play
                                           more dialtones */
-                                       if (!tv.tv_usec && !tv.tv_sec) {
+                                       if (ast_tvzero(tv)) {
                                                /* If we're due for a dialtone, play one */
                                                if (write(i->fd, DialTone + tonepos, 240) != 240)
                                                        ast_log(LOG_WARNING, "Dial tone write error\n");
@@ -832,30 +1065,26 @@ static void *do_monitor(void *data)
                        i = i->next;
                }
                /* Okay, now that we know what to do, release the interface lock */
-               ast_pthread_mutex_unlock(&iflock);
-               
-               /* And from now on, we're okay to be killed, so release the monitor lock as well */
-               ast_pthread_mutex_unlock(&monlock);
+               ast_mutex_unlock(&iflock);
+
                /* Wait indefinitely for something to happen */
-               if (dotone) {
+               if (dotone && i->mode != MODE_SIGMA) {
                        /* If we're ready to recycle the time, set it to 30 ms */
                        tonepos += 240;
                        if (tonepos >= sizeof(DialTone))
                                        tonepos = 0;
-                       if (!tv.tv_usec && !tv.tv_sec) {
-                               tv.tv_usec = 30000;
-                               tv.tv_sec = 0;
+                       if (ast_tvzero(tv)) {
+                               tv = ast_tv(30000, 0);
                        }
-                       res = select(n + 1, &rfds, NULL, &efds, &tv);
+                       res = ast_select(n + 1, &rfds, NULL, &efds, &tv);
                } else {
-                       res = select(n + 1, &rfds, NULL, &efds, NULL);
-                       tv.tv_usec = 0;
-                       tv.tv_sec = 0;
+                       res = ast_select(n + 1, &rfds, NULL, &efds, NULL);
+                       tv = ast_tv(0,0);
                        tonepos = 0;
                }
                /* Okay, select has finished.  Let's see what happened.  */
                if (res < 0) {
-                       ast_log(LOG_WARNING, "select return %d: %s\n", res, strerror(errno));
+                       ast_debug(1, "select return %d: %s\n", res, strerror(errno));
                        continue;
                }
                /* If there are no fd's changed, just continue, it's probably time
@@ -864,31 +1093,28 @@ static void *do_monitor(void *data)
                        continue;
                /* Alright, lock the interface list again, and let's look and see what has
                   happened */
-               if (ast_pthread_mutex_lock(&iflock)) {
+               if (ast_mutex_lock(&iflock)) {
                        ast_log(LOG_WARNING, "Unable to lock the interface list\n");
                        continue;
                }
+
                i = iflist;
-               while(i) {
+               for(; i; i=i->next) {
                        if (FD_ISSET(i->fd, &rfds)) {
                                if (i->owner) {
-                                       ast_log(LOG_WARNING, "Whoa....  I'm owned but found (%d, %s)...\n", i->fd, i->dev);
                                        continue;
                                }
                                phone_mini_packet(i);
                        }
                        if (FD_ISSET(i->fd, &efds)) {
                                if (i->owner) {
-                                       ast_log(LOG_WARNING, "Whoa....  I'm owned but found (%d, %s)...\n", i->fd, i->dev);
                                        continue;
                                }
                                phone_check_exception(i);
                        }
-                       i=i->next;
                }
-               ast_pthread_mutex_unlock(&iflock);
+               ast_mutex_unlock(&iflock);
        }
-       /* Never reached */
        return NULL;
        
 }
@@ -896,30 +1122,37 @@ static void *do_monitor(void *data)
 static int restart_monitor()
 {
        /* If we're supposed to be stopped -- stay stopped */
-       if (monitor_thread == -2)
+       if (monitor_thread == AST_PTHREADT_STOP)
                return 0;
-       if (ast_pthread_mutex_lock(&monlock)) {
+       if (ast_mutex_lock(&monlock)) {
                ast_log(LOG_WARNING, "Unable to lock monitor\n");
                return -1;
        }
        if (monitor_thread == pthread_self()) {
-               ast_pthread_mutex_unlock(&monlock);
+               ast_mutex_unlock(&monlock);
                ast_log(LOG_WARNING, "Cannot kill myself\n");
                return -1;
        }
-       if (monitor_thread != -1) {
-               pthread_cancel(monitor_thread);
-#if 0
+       if (monitor_thread != AST_PTHREADT_NULL) {
+               if (ast_mutex_lock(&iflock)) {
+                       ast_mutex_unlock(&monlock);
+                       ast_log(LOG_WARNING, "Unable to lock the interface list\n");
+                       return -1;
+               }
+               monitor = 0;
+               while (pthread_kill(monitor_thread, SIGURG) == 0)
+                       sched_yield();
                pthread_join(monitor_thread, NULL);
-#endif
+               ast_mutex_unlock(&iflock);
        }
+       monitor = 1;
        /* Start a new monitor */
-       if (pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {
-               ast_pthread_mutex_unlock(&monlock);
+       if (ast_pthread_create_background(&monitor_thread, NULL, do_monitor, NULL) < 0) {
+               ast_mutex_unlock(&monlock);
                ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
                return -1;
        }
-       ast_pthread_mutex_unlock(&monlock);
+       ast_mutex_unlock(&monlock);
        return 0;
 }
 
@@ -929,27 +1162,29 @@ static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain)
        struct phone_pvt *tmp;
        int flags;      
        
-       tmp = malloc(sizeof(struct phone_pvt));
+       tmp = ast_calloc(1, sizeof(*tmp));
        if (tmp) {
                tmp->fd = open(iface, O_RDWR);
                if (tmp->fd < 0) {
                        ast_log(LOG_WARNING, "Unable to open '%s'\n", iface);
-                       free(tmp);
+                       ast_free(tmp);
                        return NULL;
                }
                if (mode == MODE_FXO) {
-                       if (ioctl(tmp->fd, IXJCTL_PORT, PORT_PSTN)) 
-                               ast_log(LOG_DEBUG, "Unable to set port to PSTN\n");
+                       if (ioctl(tmp->fd, IXJCTL_PORT, PORT_PSTN)) {
+                               ast_debug(1, "Unable to set port to PSTN\n");
+                       }
                } else {
                        if (ioctl(tmp->fd, IXJCTL_PORT, PORT_POTS)) 
-                               ast_log(LOG_DEBUG, "Unable to set port to POTS\n");
+                                if (mode != MODE_FXS)
+                                     ast_debug(1, "Unable to set port to POTS\n");
                }
                ioctl(tmp->fd, PHONE_PLAY_STOP);
                ioctl(tmp->fd, PHONE_REC_STOP);
                ioctl(tmp->fd, PHONE_RING_STOP);
                ioctl(tmp->fd, PHONE_CPT_STOP);
-               if (ioctl(tmp->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) 
-                       ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno));
+               if (ioctl(tmp->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK))
+                       ast_debug(1, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno));
                if (echocancel != AEC_OFF)
                        ioctl(tmp->fd, IXJCTL_AEC_START, echocancel);
                if (silencesupression) 
@@ -965,14 +1200,15 @@ static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain)
                tmp->lastinput = -1;
                tmp->ministate = 0;
                memset(tmp->ext, 0, sizeof(tmp->ext));
-               strncpy(tmp->language, language, sizeof(tmp->language)-1);
-               strncpy(tmp->dev, iface, sizeof(tmp->dev)-1);
-               strncpy(tmp->context, context, sizeof(tmp->context)-1);
+               ast_copy_string(tmp->language, language, sizeof(tmp->language));
+               ast_copy_string(tmp->dev, iface, sizeof(tmp->dev));
+               ast_copy_string(tmp->context, context, sizeof(tmp->context));
                tmp->next = NULL;
                tmp->obuflen = 0;
                tmp->dialtone = 0;
                tmp->cpt = 0;
-               strncpy(tmp->callerid, callerid, sizeof(tmp->callerid)-1);
+               ast_copy_string(tmp->cid_num, cid_num, sizeof(tmp->cid_num));
+               ast_copy_string(tmp->cid_name, cid_name, sizeof(tmp->cid_name));
                tmp->txgain = txgain;
                ioctl(tmp->fd, PHONE_PLAY_VOLUME, tmp->txgain);
                tmp->rxgain = rxgain;
@@ -981,36 +1217,44 @@ static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain)
        return tmp;
 }
 
-static struct ast_channel *phone_request(char *type, int format, void *data)
+static struct ast_channel *phone_request(const char *type, int format, void *data, int *cause)
 {
        int oldformat;
        struct phone_pvt *p;
        struct ast_channel *tmp = NULL;
        char *name = data;
-       
-       oldformat = format;
-       format &= (AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW);
-       if (!format) {
-               ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%d'\n", oldformat);
-               return NULL;
-       }
+
        /* Search for an unowned channel */
-       if (ast_pthread_mutex_lock(&iflock)) {
+       if (ast_mutex_lock(&iflock)) {
                ast_log(LOG_ERROR, "Unable to lock interface list???\n");
                return NULL;
        }
        p = iflist;
        while(p) {
-               if (!strcmp(name, p->dev + 5)) {
-                       if (!p->owner) {
-                               tmp = phone_new(p, AST_STATE_DOWN, p->context);
-                               break;
-                       }
+               if (p->mode == MODE_FXS ||
+                   format & (AST_FORMAT_G729A | AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW)) {
+                   size_t length = strlen(p->dev + 5);
+               if (strncmp(name, p->dev + 5, length) == 0 &&
+                   !isalnum(name[length])) {
+                   if (!p->owner) {
+                     tmp = phone_new(p, AST_STATE_DOWN, p->context);
+                     break;
+                } else
+                     *cause = AST_CAUSE_BUSY;
+            }
                }
                p = p->next;
        }
-       ast_pthread_mutex_unlock(&iflock);
+       ast_mutex_unlock(&iflock);
        restart_monitor();
+       if (tmp == NULL) {
+               oldformat = format;
+               format &= (AST_FORMAT_G729A | AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW);
+               if (!format) {
+                       ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%d'\n", oldformat);
+                       return NULL;
+               }
+       }
        return tmp;
 }
 
@@ -1037,21 +1281,81 @@ static int parse_gain_value(char *gain_type, char *value)
        return (int)gain;
 }
 
-int load_module()
+static int __unload_module(void)
+{
+       struct phone_pvt *p, *pl;
+       /* First, take us out of the channel loop */
+       ast_channel_unregister(cur_tech);
+       if (!ast_mutex_lock(&iflock)) {
+               /* Hangup all interfaces if they have an owner */
+               p = iflist;
+               while(p) {
+                       if (p->owner)
+                               ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD);
+                       p = p->next;
+               }
+               iflist = NULL;
+               ast_mutex_unlock(&iflock);
+       } else {
+               ast_log(LOG_WARNING, "Unable to lock the monitor\n");
+               return -1;
+       }
+       if (!ast_mutex_lock(&monlock)) {
+               if (monitor_thread > AST_PTHREADT_NULL) {
+                       monitor = 0;
+                       while (pthread_kill(monitor_thread, SIGURG) == 0)
+                               sched_yield();
+                       pthread_join(monitor_thread, NULL);
+               }
+               monitor_thread = AST_PTHREADT_STOP;
+               ast_mutex_unlock(&monlock);
+       } else {
+               ast_log(LOG_WARNING, "Unable to lock the monitor\n");
+               return -1;
+       }
+
+       if (!ast_mutex_lock(&iflock)) {
+               /* Destroy all the interfaces and free their memory */
+               p = iflist;
+               while(p) {
+                       /* Close the socket, assuming it's real */
+                       if (p->fd > -1)
+                               close(p->fd);
+                       pl = p;
+                       p = p->next;
+                       /* Free associated memory */
+                       ast_free(pl);
+               }
+               iflist = NULL;
+               ast_mutex_unlock(&iflock);
+       } else {
+               ast_log(LOG_WARNING, "Unable to lock the monitor\n");
+               return -1;
+       }
+               
+       return 0;
+}
+
+static int unload_module(void)
+{
+       return __unload_module();
+}
+
+static int load_module(void)
 {
        struct ast_config *cfg;
        struct ast_variable *v;
        struct phone_pvt *tmp;
        int mode = MODE_IMMEDIATE;
        int txgain = DEFAULT_GAIN, rxgain = DEFAULT_GAIN; /* default gain 1.0 */
-       cfg = ast_load(config);
+       cfg = ast_config_load(config);
 
        /* We *must* have a config file otherwise stop immediately */
        if (!cfg) {
                ast_log(LOG_ERROR, "Unable to load config %s\n", config);
-               return -1;
+               return AST_MODULE_LOAD_DECLINE;
        }
-       if (ast_pthread_mutex_lock(&iflock)) {
+       if (ast_mutex_lock(&iflock)) {
                /* It's a little silly to lock it, but we mind as well just to be sure */
                ast_log(LOG_ERROR, "Unable to lock interface list???\n");
                return -1;
@@ -1067,33 +1371,43 @@ int load_module()
                                        
                                } else {
                                        ast_log(LOG_ERROR, "Unable to register channel '%s'\n", v->value);
-                                       ast_destroy(cfg);
-                                       ast_pthread_mutex_unlock(&iflock);
-                                       unload_module();
+                                       ast_config_destroy(cfg);
+                                       ast_mutex_unlock(&iflock);
+                                       __unload_module();
                                        return -1;
                                }
                } else if (!strcasecmp(v->name, "silencesupression")) {
                        silencesupression = ast_true(v->value);
                } else if (!strcasecmp(v->name, "language")) {
-                       strncpy(language, v->value, sizeof(language)-1);
+                       ast_copy_string(language, v->value, sizeof(language));
                } else if (!strcasecmp(v->name, "callerid")) {
-                       strncpy(callerid, v->value, sizeof(callerid)-1);
+                       ast_callerid_split(v->value, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num));
                } else if (!strcasecmp(v->name, "mode")) {
                        if (!strncasecmp(v->value, "di", 2)) 
                                mode = MODE_DIALTONE;
+                       else if (!strncasecmp(v->value, "sig", 3))
+                               mode = MODE_SIGMA;
                        else if (!strncasecmp(v->value, "im", 2))
                                mode = MODE_IMMEDIATE;
+                       else if (!strncasecmp(v->value, "fxs", 3)) {
+                               mode = MODE_FXS;
+                               prefformat = 0x01ff0000; /* All non-voice */
+                       }
                        else if (!strncasecmp(v->value, "fx", 2))
                                mode = MODE_FXO;
                        else
                                ast_log(LOG_WARNING, "Unknown mode: %s\n", v->value);
                } else if (!strcasecmp(v->name, "context")) {
-                       strncpy(context, v->value, sizeof(context)-1);
+                       ast_copy_string(context, v->value, sizeof(context));
                } else if (!strcasecmp(v->name, "format")) {
-                       if (!strcasecmp(v->value, "g723.1")) {
+                       if (!strcasecmp(v->value, "g729")) {
+                               prefformat = AST_FORMAT_G729A;
+                        } else if (!strcasecmp(v->value, "g723.1")) {
                                prefformat = AST_FORMAT_G723_1;
                        } else if (!strcasecmp(v->value, "slinear")) {
-                               prefformat = AST_FORMAT_SLINEAR;
+                               if (mode == MODE_FXS)
+                                   prefformat |= AST_FORMAT_SLINEAR;
+                               else prefformat = AST_FORMAT_SLINEAR;
                        } else if (!strcasecmp(v->value, "ulaw")) {
                                prefformat = AST_FORMAT_ULAW;
                        } else
@@ -1116,91 +1430,26 @@ int load_module()
                }       
                v = v->next;
        }
-       ast_pthread_mutex_unlock(&iflock);
-       /* Make sure we can register our Adtranphone channel type */
-       if (ast_channel_register(type, tdesc, 
-                        AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW, phone_request)) {
-               ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
-               ast_destroy(cfg);
-               unload_module();
-               return -1;
-       }
-       ast_destroy(cfg);
-       /* And start the monitor for the first time */
-       restart_monitor();
-       return 0;
-}
-
+       ast_mutex_unlock(&iflock);
 
+       if (mode == MODE_FXS) {
+               phone_tech_fxs.capabilities = prefformat;
+               cur_tech = &phone_tech_fxs;
+       } else
+               cur_tech = (struct ast_channel_tech *) &phone_tech;
 
-int unload_module()
-{
-       struct phone_pvt *p, *pl;
-       /* First, take us out of the channel loop */
-       ast_channel_unregister(type);
-       if (!ast_pthread_mutex_lock(&iflock)) {
-               /* Hangup all interfaces if they have an owner */
-               p = iflist;
-               while(p) {
-                       if (p->owner)
-                               ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD);
-                       p = p->next;
-               }
-               iflist = NULL;
-               ast_pthread_mutex_unlock(&iflock);
-       } else {
-               ast_log(LOG_WARNING, "Unable to lock the monitor\n");
-               return -1;
-       }
-       if (!ast_pthread_mutex_lock(&monlock)) {
-               if (monitor_thread > -1) {
-                       pthread_cancel(monitor_thread);
-                       pthread_join(monitor_thread, NULL);
-               }
-               monitor_thread = -2;
-               ast_pthread_mutex_unlock(&monlock);
-       } else {
-               ast_log(LOG_WARNING, "Unable to lock the monitor\n");
-               return -1;
-       }
+       /* Make sure we can register our Adtranphone channel type */
 
-       if (!ast_pthread_mutex_lock(&iflock)) {
-               /* Destroy all the interfaces and free their memory */
-               p = iflist;
-               while(p) {
-                       /* Close the socket, assuming it's real */
-                       if (p->fd > -1)
-                               close(p->fd);
-                       pl = p;
-                       p = p->next;
-                       /* Free associated memory */
-                       free(pl);
-               }
-               iflist = NULL;
-               ast_pthread_mutex_unlock(&iflock);
-       } else {
-               ast_log(LOG_WARNING, "Unable to lock the monitor\n");
+       if (ast_channel_register(cur_tech)) {
+               ast_log(LOG_ERROR, "Unable to register channel class 'Phone'\n");
+               ast_config_destroy(cfg);
+               __unload_module();
                return -1;
        }
-               
+       ast_config_destroy(cfg);
+       /* And start the monitor for the first time */
+       restart_monitor();
        return 0;
 }
 
-int usecount()
-{
-       int res;
-       ast_pthread_mutex_lock(&usecnt_lock);
-       res = usecnt;
-       ast_pthread_mutex_unlock(&usecnt_lock);
-       return res;
-}
-
-char *description()
-{
-       return desc;
-}
-
-char *key()
-{
-       return ASTERISK_GPL_KEY;
-}
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Linux Telephony API Support");