/ implemented basic group'ing, as per chan_zap
authorBen Kramer <bkramer@voicetronix.com.au>
Mon, 5 Apr 2004 05:37:01 +0000 (05:37 +0000)
committerBen Kramer <bkramer@voicetronix.com.au>
Mon, 5 Apr 2004 05:37:01 +0000 (05:37 +0000)
/ reformated whole file to consistent format

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2624 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_vpb.c

index 376ece6..fb0b7b3 100755 (executable)
@@ -9,12 +9,6 @@
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
- * 
- */
-
-/* This module is now being supported by Voicetronix. If you wish to submit
- * any patches to it please email them to support@voicetronix.com.au
- *
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>
@@ -36,6 +30,7 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <ctype.h>
 
 #include <vpbapi.h>
 
 
 #include <vpbapi.h>
 
@@ -156,13 +151,13 @@ VPB_TONE_MAP DialToneMap[] = {    { VPB_BUSY_AUST, VPB_CALL_DISCONNECT, 0 },
 
 
 typedef struct  {
 
 
 typedef struct  {
-     int inuse;
-     struct ast_channel *c0, *c1, **rc;
-     struct ast_frame **fo;
-     int flags;
-     ast_mutex_t lock;
-     pthread_cond_t cond;
-     int endbridge;
+       int inuse;
+       struct ast_channel *c0, *c1, **rc;
+       struct ast_frame **fo;
+       int flags;
+       ast_mutex_t lock;
+       pthread_cond_t cond;
+       int endbridge;
 } vpb_bridge_t;
 static vpb_bridge_t * bridges;
 static int max_bridges = MAX_BRIDGES_V4PCI;
 } vpb_bridge_t;
 static vpb_bridge_t * bridges;
 static int max_bridges = MAX_BRIDGES_V4PCI;
@@ -170,64 +165,66 @@ static int max_bridges = MAX_BRIDGES_V4PCI;
 static ast_mutex_t bridge_lock = AST_MUTEX_INITIALIZER;
 
 typedef enum {
 static ast_mutex_t bridge_lock = AST_MUTEX_INITIALIZER;
 
 typedef enum {
-     vpb_model_unknown = 0, 
-     vpb_model_v4pci,
-     vpb_model_v12pci
+       vpb_model_unknown = 0, 
+       vpb_model_v4pci,
+       vpb_model_v12pci
 } vpb_model_t;
 
 static struct vpb_pvt {
 
 } vpb_model_t;
 
 static struct vpb_pvt {
 
-     ast_mutex_t owner_lock;           /* Protect blocks that expect ownership to remain the same */
-     struct ast_channel *owner;                /* Channel we belong to, possibly NULL */
-     
-     int mode;                         /* fxo/imediate/dialtone*/
-     int handle;                       /* Handle for vpb interface */
+       ast_mutex_t owner_lock;                 /* Protect blocks that expect ownership to remain the same */
+       struct ast_channel *owner;              /* Channel we belong to, possibly NULL */
 
 
-     int state;                                /* used to keep port state (internal to driver) */
+       int mode;                               /* fxo/imediate/dialtone*/
+       int handle;                             /* Handle for vpb interface */
 
 
-     char dev[256];
-     vpb_model_t vpb_model;
-     
-     struct ast_frame f, fr;
-     char buf[VPB_MAX_BUF];            /* Static buffer for reading frames */
-     
-     int dialtone;
-     float txgain, rxgain;             /* Hardware gain control */
-     float txswgain, rxswgain;         /* Software gain control */
-     
-     int wantdtmf;                     /* Waiting for DTMF. */
-     char context[AST_MAX_EXTENSION];
+       int state;                              /* used to keep port state (internal to driver) */
 
 
-     char ext[AST_MAX_EXTENSION];
-     char language[MAX_LANGUAGE];
-     char callerid[AST_MAX_EXTENSION]; /* CallerId used for directly connected phone */
+       int group;                              /* Which group this port belongs to */
 
 
-     int lastoutput;
-     int lastinput;
-     int last_ignore_dtmf;
-     
-     void *busy_timer;
-     int busy_timer_id;
+       char dev[256];
+       vpb_model_t vpb_model;
 
 
-     void *ringback_timer; 
-     int ringback_timer_id;
-     
-     double lastgrunt;
+       struct ast_frame f, fr;
+       char buf[VPB_MAX_BUF];                  /* Static buffer for reading frames */
 
 
-     ast_mutex_t lock;         /* This one just protects bridge ptr below */
-     vpb_bridge_t *bridge;
+       int dialtone;
+       float txgain, rxgain;                   /* Hardware gain control */
+       float txswgain, rxswgain;               /* Software gain control */
 
 
-     int stopreads;            /* Stop reading...*/
-     
-     pthread_t readthread;     /* For monitoring read channel. One per owned channel. */
+       int wantdtmf;                           /* Waiting for DTMF. */
+       char context[AST_MAX_EXTENSION];
 
 
-     ast_mutex_t record_lock;  /* This one prevents reentering a record_buf block */
-     ast_mutex_t play_lock;    /* This one prevents reentering a play_buf block */
+       char ext[AST_MAX_EXTENSION];
+       char language[MAX_LANGUAGE];
+       char callerid[AST_MAX_EXTENSION];       /* CallerId used for directly connected phone */
 
 
-     ast_mutex_t play_dtmf_lock;
-     char play_dtmf[16];
-     
-     struct vpb_pvt *next;     /* Next channel in list */
+       int lastoutput;
+       int lastinput;
+       int last_ignore_dtmf;
+
+       void *busy_timer;
+       int busy_timer_id;
+
+       void *ringback_timer; 
+       int ringback_timer_id;
+
+       double lastgrunt;
+
+       ast_mutex_t lock;                       /* This one just protects bridge ptr below */
+       vpb_bridge_t *bridge;
+
+       int stopreads;                          /* Stop reading...*/
+
+       pthread_t readthread;                   /* For monitoring read channel. One per owned channel. */
+
+       ast_mutex_t record_lock;                /* This one prevents reentering a record_buf block */
+       ast_mutex_t play_lock;                  /* This one prevents reentering a play_buf block */
+
+       ast_mutex_t play_dtmf_lock;
+       char play_dtmf[16];
+
+       struct vpb_pvt *next;                   /* Next channel in list */
 
 } *iflist = NULL;
 
 
 } *iflist = NULL;
 
@@ -245,128 +242,127 @@ static void *do_chanreads(void *pvt);
 
 static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc)
 {
 
 static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc)
 {
-     struct vpb_pvt *p0 = (struct vpb_pvt *)c0->pvt->pvt;
-     struct vpb_pvt *p1 = (struct vpb_pvt *)c1->pvt->pvt;
-     int i, res;
-     
-#ifdef BAD_V4PCI_BRIDGE
-     if(p0->vpb_model==vpb_model_v4pci)
-       return -2;
-#endif
+       struct vpb_pvt *p0 = (struct vpb_pvt *)c0->pvt->pvt;
+       struct vpb_pvt *p1 = (struct vpb_pvt *)c1->pvt->pvt;
+       int i, res;
 
 
-     /* Bridge channels, check if we can.  I believe we always can, so find a slot.*/
-     
-     ast_mutex_lock(&bridge_lock); {
-         for (i = 0; i < max_bridges; i++) 
-              if (!bridges[i].inuse)
-                   break;
-         if (i < max_bridges) {
-              bridges[i].inuse = 1;
-              bridges[i].endbridge = 0;
-              bridges[i].flags = flags;
-              bridges[i].rc = rc;
-              bridges[i].fo = fo;
-              bridges[i].c0 = c0;
-              bridges[i].c1 = c1;
-              ast_mutex_init(&bridges[i].lock);
-              pthread_cond_init(&bridges[i].cond, NULL);
-         }            
-     } ast_mutex_unlock(&bridge_lock); 
-
-     if (i == max_bridges) {
-         ast_log(LOG_WARNING, "Failed to bridge %s and %s!\n", c0->name, c1->name);
-         return -2;
-     } else {
-
-         /* Set bridge pointers. You don't want to take these locks while holding bridge lock.*/
-         ast_mutex_lock(&p0->lock); {
-              p0->bridge = &bridges[i];
-         } ast_mutex_unlock(&p0->lock);
-
-         ast_mutex_lock(&p1->lock); {
-              p1->bridge = &bridges[i];
-         } ast_mutex_unlock(&p1->lock);
-
-         if (option_verbose>1) 
-              ast_verbose(VERBOSE_PREFIX_2 "Bridging call entered with [%s, %s]\n", c0->name, c1->name);
-     }
-
-#ifdef HALF_DUPLEX_BRIDGE
-          
-     if (option_verbose>1) 
-       ast_verbose(VERBOSE_PREFIX_2 "Starting half-duplex bridge [%s, %s]\n", c0->name, c1->name);
-          
-     int dir = 0;
-           
-     memset(p0->buf, 0, sizeof p0->buf);
-     memset(p1->buf, 0, sizeof p1->buf);
-
-     vpb_record_buf_start(p0->handle, VPB_ALAW);
-     vpb_record_buf_start(p1->handle, VPB_ALAW);
-
-     vpb_play_buf_start(p0->handle, VPB_ALAW);
-     vpb_play_buf_start(p1->handle, VPB_ALAW);
-     while( !bridges[i].endbridge ) {
-       struct vpb_pvt *from, *to;
-       if(++dir%2) {
-           from = p0;
-           to = p1;
+       #ifdef BAD_V4PCI_BRIDGE
+       if(p0->vpb_model==vpb_model_v4pci)
+               return -2;
+       #endif
+
+       /* Bridge channels, check if we can.  I believe we always can, so find a slot.*/
+
+       ast_mutex_lock(&bridge_lock); {
+               for (i = 0; i < max_bridges; i++) 
+                       if (!bridges[i].inuse)
+                               break;
+               if (i < max_bridges) {
+                       bridges[i].inuse = 1;
+                       bridges[i].endbridge = 0;
+                       bridges[i].flags = flags;
+                       bridges[i].rc = rc;
+                       bridges[i].fo = fo;
+                       bridges[i].c0 = c0;
+                       bridges[i].c1 = c1;
+                       ast_mutex_init(&bridges[i].lock);
+                       pthread_cond_init(&bridges[i].cond, NULL);
+               }              
+       } ast_mutex_unlock(&bridge_lock); 
+
+       if (i == max_bridges) {
+               ast_log(LOG_WARNING, "Failed to bridge %s and %s!\n", c0->name, c1->name);
+               return -2;
        } else {
        } else {
-           from = p1;
-           to = p0;
+               /* Set bridge pointers. You don't want to take these locks while holding bridge lock.*/
+               ast_mutex_lock(&p0->lock); {
+                       p0->bridge = &bridges[i];
+               } ast_mutex_unlock(&p0->lock);
+
+               ast_mutex_lock(&p1->lock); {
+                       p1->bridge = &bridges[i];
+               } ast_mutex_unlock(&p1->lock);
+
+               if (option_verbose>1) 
+                       ast_verbose(VERBOSE_PREFIX_2 "Bridging call entered with [%s, %s]\n", c0->name, c1->name);
        }
        }
-        vpb_record_buf_sync(from->handle, from->buf, VPB_SAMPLES);
-        vpb_play_buf_sync(to->handle, from->buf, VPB_SAMPLES);
-     }
-          
-     vpb_record_buf_finish(p0->handle);
-     vpb_record_buf_finish(p1->handle);
-
-     vpb_play_buf_finish(p0->handle);
-     vpb_play_buf_finish(p1->handle);
-
-     if (option_verbose>1) 
-       ast_verbose(VERBOSE_PREFIX_2 "Finished half-duplex bridge [%s, %s]\n", c0->name, c1->name);
-          
-     res = VPB_OK;
-          
-#else
-     
-     res = vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_ON, i+1 /* resource 1 & 2 only for V4PCI*/ );
-     if (res == VPB_OK) {
-         pthread_cond_wait(&bridges[i].cond, &bridges[i].lock); /* Wait for condition signal. */
-         vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_OFF, i+1 /* resource 1 & 2 only for V4PCI*/ ); 
-     }
 
 
-#endif
-     
-     ast_mutex_lock(&bridge_lock); {
-         bridges[i].inuse = 0;
-         ast_mutex_destroy(&bridges[i].lock);
-         pthread_cond_destroy(&bridges[i].cond);       
-     } ast_mutex_unlock(&bridge_lock); 
-     
-     ast_mutex_lock(&p0->lock); {
-         p0->bridge = NULL;
-     } ast_mutex_unlock(&p0->lock);
-     
-     ast_mutex_lock(&p1->lock); {
-         p1->bridge = NULL;
-     } ast_mutex_unlock(&p1->lock);
+       #ifdef HALF_DUPLEX_BRIDGE
 
 
-     
-     if (option_verbose>1) 
-         ast_verbose(VERBOSE_PREFIX_2 "Bridging call done with [%s, %s] => %d\n", c0->name, c1->name, res);
-    
-     return (res==VPB_OK)?0:-1;
+       if (option_verbose>1) 
+               ast_verbose(VERBOSE_PREFIX_2 "Starting half-duplex bridge [%s, %s]\n", c0->name, c1->name);
+
+       int dir = 0;
+
+       memset(p0->buf, 0, sizeof p0->buf);
+       memset(p1->buf, 0, sizeof p1->buf);
+
+       vpb_record_buf_start(p0->handle, VPB_ALAW);
+       vpb_record_buf_start(p1->handle, VPB_ALAW);
+
+       vpb_play_buf_start(p0->handle, VPB_ALAW);
+       vpb_play_buf_start(p1->handle, VPB_ALAW);
+
+       while( !bridges[i].endbridge ) {
+               struct vpb_pvt *from, *to;
+               if(++dir%2) {
+                       from = p0;
+                       to = p1;
+               } else {
+                       from = p1;
+                       to = p0;
+               }
+               vpb_record_buf_sync(from->handle, from->buf, VPB_SAMPLES);
+               vpb_play_buf_sync(to->handle, from->buf, VPB_SAMPLES);
+       }
+
+       vpb_record_buf_finish(p0->handle);
+       vpb_record_buf_finish(p1->handle);
+
+       vpb_play_buf_finish(p0->handle);
+       vpb_play_buf_finish(p1->handle);
+
+       if (option_verbose>1) 
+               ast_verbose(VERBOSE_PREFIX_2 "Finished half-duplex bridge [%s, %s]\n", c0->name, c1->name);
+
+       res = VPB_OK;
+
+       #else
+
+       res = vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_ON, i+1 /* resource 1 & 2 only for V4PCI*/ );
+       if (res == VPB_OK) {
+               pthread_cond_wait(&bridges[i].cond, &bridges[i].lock); /* Wait for condition signal. */
+               vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_OFF, i+1 /* resource 1 & 2 only for V4PCI*/ ); 
+       }
+
+       #endif
+
+       ast_mutex_lock(&bridge_lock); {
+               bridges[i].inuse = 0;
+               ast_mutex_destroy(&bridges[i].lock);
+               pthread_cond_destroy(&bridges[i].cond); 
+       } ast_mutex_unlock(&bridge_lock); 
+
+       ast_mutex_lock(&p0->lock); {
+               p0->bridge = NULL;
+       } ast_mutex_unlock(&p0->lock);
+
+       ast_mutex_lock(&p1->lock); {
+               p1->bridge = NULL;
+       } ast_mutex_unlock(&p1->lock);
+
+
+       if (option_verbose>1) 
+               ast_verbose(VERBOSE_PREFIX_2 "Bridging call done with [%s, %s] => %d\n", c0->name, c1->name, res);
+
+       return (res==VPB_OK)?0:-1;
 }
 
 static double get_time_in_ms()
 {
 }
 
 static double get_time_in_ms()
 {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return ((double)tv.tv_sec*1000)+((double)tv.tv_usec/1000);
+       struct timeval tv;
+       gettimeofday(&tv, NULL);
+       return ((double)tv.tv_sec*1000)+((double)tv.tv_usec/1000);
 }
 
 // Caller ID can be located in different positions between the rings depending on your Telco
 }
 
 // Caller ID can be located in different positions between the rings depending on your Telco
@@ -378,538 +374,542 @@ static double get_time_in_ms()
 
 static void get_callerid(struct vpb_pvt *p)
 {
 
 static void get_callerid(struct vpb_pvt *p)
 {
-    short buf[CID_MSECS*8]; // 8kHz sampling rate
-    double cid_record_time;
-    int rc;
-    
-    if(strcasecmp(p->callerid, "on")) {
-       p->owner->callerid = strdup("unknown");
-       return;
-    }
-    
-    if( ast_mutex_trylock(&p->record_lock) == 0 ) {
-
-        char callerid[AST_MAX_EXTENSION] = ""; 
-       
-       cid_record_time = get_time_in_ms();
-       if (option_verbose>3) 
-            ast_verbose(VERBOSE_PREFIX_4 "CID record - start\n");
-
-#ifdef ANALYSE_CID
-        VPB_RECORD record_parms = { "", 8 * 1000 }; // record a couple of rings
-        vpb_record_set(p->handle,&record_parms);
-        ast_verbose(VERBOSE_PREFIX_4 "Recording debug CID sample to /tmp/cid.raw\n");
-       vpb_record_file_sync(p->handle,"/tmp/cid.raw",VPB_LINEAR);
-       rc = 1; // don't try to decode_cid
-#else  
-       // Skip any trailing ringtone
-       vpb_sleep(RING_SKIP);
-       
-        if (option_verbose>3) 
-            ast_verbose(VERBOSE_PREFIX_4 "CID record - skipped %fms trailing ring\n", get_time_in_ms() - cid_record_time);
-       cid_record_time = get_time_in_ms();
-
-       // Record bit between the rings which contains the callerid
-        vpb_record_buf_start(p->handle, VPB_LINEAR);
-       rc = vpb_record_buf_sync(p->handle, (char*)buf, sizeof(buf));
-        vpb_record_buf_finish(p->handle);
-#endif
+       short buf[CID_MSECS*8]; // 8kHz sampling rate
+       double cid_record_time;
+       int rc;
 
 
-        if (option_verbose>3) 
-            ast_verbose(VERBOSE_PREFIX_4 "CID record - recorded %fms between rings\n", get_time_in_ms() - cid_record_time);
+       if(strcasecmp(p->callerid, "on")) {
+               p->owner->callerid = strdup("unknown");
+               return;
+       }
 
 
-       ast_mutex_unlock(&p->record_lock);
+       if( ast_mutex_trylock(&p->record_lock) == 0 ) {
 
 
-       if( rc != VPB_OK ) {
-           ast_log(LOG_ERROR, "Failed to record caller id sample on %s\n", p->dev );
-           return;
-       }
-       
-       // This decodes FSK 1200baud type callerid
-        if ((rc=vpb_cid_decode(callerid, buf, CID_MSECS*8)) == VPB_OK ) {
-           if(!*callerid) strcpy(callerid,"undisclosed"); // blocked CID (eg caller used 1831)
-        } else {
-           ast_log(LOG_ERROR, "Failed to decode caller id on %s - %s\n", p->dev, vpb_strerror(rc) );
-            strcpy(callerid,"unknown");
-        }
-        p->owner->callerid = strdup(callerid);
-    
-    } else 
-        ast_log(LOG_ERROR, "Failed to set record mode for caller id on %s\n", p->dev );
+               char callerid[AST_MAX_EXTENSION] = ""; 
+
+               cid_record_time = get_time_in_ms();
+               if (option_verbose>3) 
+                       ast_verbose(VERBOSE_PREFIX_4 "CID record - start\n");
+
+               #ifdef ANALYSE_CID
+               VPB_RECORD record_parms = { "", 8 * 1000 }; // record a couple of rings
+               vpb_record_set(p->handle,&record_parms);
+               ast_verbose(VERBOSE_PREFIX_4 "Recording debug CID sample to /tmp/cid.raw\n");
+               vpb_record_file_sync(p->handle,"/tmp/cid.raw",VPB_LINEAR);
+               rc = 1; // don't try to decode_cid
+               #else   
+               // Skip any trailing ringtone
+               vpb_sleep(RING_SKIP);
+
+               if (option_verbose>3) 
+                       ast_verbose(VERBOSE_PREFIX_4 "CID record - skipped %fms trailing ring\n",
+                                get_time_in_ms() - cid_record_time);
+               cid_record_time = get_time_in_ms();
+
+               // Record bit between the rings which contains the callerid
+               vpb_record_buf_start(p->handle, VPB_LINEAR);
+               rc = vpb_record_buf_sync(p->handle, (char*)buf, sizeof(buf));
+               vpb_record_buf_finish(p->handle);
+               #endif
+
+               if (option_verbose>3) 
+                       ast_verbose(VERBOSE_PREFIX_4 "CID record - recorded %fms between rings\n", 
+                               get_time_in_ms() - cid_record_time);
+
+               ast_mutex_unlock(&p->record_lock);
+
+               if( rc != VPB_OK ) {
+                       ast_log(LOG_ERROR, "Failed to record caller id sample on %s\n", p->dev );
+                       return;
+               }
+
+               // This decodes FSK 1200baud type callerid
+               if ((rc=vpb_cid_decode(callerid, buf, CID_MSECS*8)) == VPB_OK ) {
+                       if(!*callerid) 
+                               strcpy(callerid,"undisclosed"); // blocked CID (eg caller used 1831)
+               } else {
+                       ast_log(LOG_ERROR, "Failed to decode caller id on %s - %s\n", p->dev, vpb_strerror(rc) );
+                       strcpy(callerid,"unknown");
+               }
+               p->owner->callerid = strdup(callerid);
+
+       } else 
+               ast_log(LOG_ERROR, "Failed to set record mode for caller id on %s\n", p->dev );
 }
 
 // Terminate any tones we are presently playing
 static void stoptone( int handle)
 {
 }
 
 // Terminate any tones we are presently playing
 static void stoptone( int handle)
 {
-    while(vpb_playtone_state(handle)!=VPB_OK){
-       vpb_tone_terminate(handle);
-        vpb_sleep(10);
-    }
+       while(vpb_playtone_state(handle)!=VPB_OK){
+               vpb_tone_terminate(handle);
+               vpb_sleep(10);
+       }
 }
 
 // Safe vpb_playtone_async
 static int playtone( int handle, VPB_TONE *tone)
 {
 }
 
 // Safe vpb_playtone_async
 static int playtone( int handle, VPB_TONE *tone)
 {
-    stoptone(handle);
-    return vpb_playtone_async(handle, tone);
+       stoptone(handle);
+       return vpb_playtone_async(handle, tone);
 }
 
 static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
 {
 }
 
 static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
 {
-     struct ast_frame f = {AST_FRAME_CONTROL}; /* default is control, Clear rest. */
-     int endbridge = 0;
-
-     if (option_verbose > 3) 
-         ast_verbose(VERBOSE_PREFIX_4 "%s handle_owned got event: [%d=>%d]\n",
-                     p->dev, e->type, e->data);
-     
-     f.src = type;
-     switch (e->type) {
-     case VPB_RING:
-         if (p->mode == MODE_FXO) {
-             f.subclass = AST_CONTROL_RING;
-         } else
-              f.frametype = -1; /* ignore ring on station port. */
-         break;
-     case VPB_RING_OFF:
-          f.frametype = -1;
-         break;
-     case VPB_TIMEREXP:
-         if (e->data == p->busy_timer_id) {
-               playtone(p->handle,&Busytone);
-                p->state = VPB_STATE_PLAYBUSY;
-               vpb_timer_start(p->busy_timer);
-               f.frametype = -1;
-         } else if (e->data == p->ringback_timer_id) {
-               playtone(p->handle, &Ringbacktone);
-               vpb_timer_start(p->ringback_timer);
-               f.frametype = -1;
-         } else {
-              f.frametype = -1; /* Ignore. */
-         }
-         break;
-     case VPB_DTMF:
-         if (p->owner->_state == AST_STATE_UP) {
-              f.frametype = AST_FRAME_DTMF;
-              f.subclass = e->data;
-         } else
-              f.frametype = -1;
-         break;
-
-     case VPB_TONEDETECT:
-         if (e->data == VPB_BUSY || e->data == VPB_BUSY_308 || e->data == VPB_BUSY_AUST ) {
-              f.subclass = AST_CONTROL_HANGUP;
-               if (p->owner->_state == AST_STATE_UP) {
+       struct ast_frame f = {AST_FRAME_CONTROL}; /* default is control, Clear rest. */
+       int endbridge = 0;
+
+       if (option_verbose > 3) 
+               ast_verbose(VERBOSE_PREFIX_4 "%s handle_owned got event: [%d=>%d]\n",
+                       p->dev, e->type, e->data);
+
+       f.src = type;
+       switch (e->type) {
+               case VPB_RING:
+                       if (p->mode == MODE_FXO) {
+                               f.subclass = AST_CONTROL_RING;
+                       } else
+                               f.frametype = -1; /* ignore ring on station port. */
+                       break;
+
+               case VPB_RING_OFF:
+                       f.frametype = -1;
+                       break;
+
+               case VPB_TIMEREXP:
+                       if (e->data == p->busy_timer_id) {
+                               playtone(p->handle,&Busytone);
+                               p->state = VPB_STATE_PLAYBUSY;
+                               vpb_timer_start(p->busy_timer);
+                               f.frametype = -1;
+                       } else if (e->data == p->ringback_timer_id) {
+                               playtone(p->handle, &Ringbacktone);
+                               vpb_timer_start(p->ringback_timer);
+                               f.frametype = -1;
+                       } else {
+                               f.frametype = -1; /* Ignore. */
+                       }
+                       break;
+
+               case VPB_DTMF:
+                       if (p->owner->_state == AST_STATE_UP) {
+                               f.frametype = AST_FRAME_DTMF;
+                               f.subclass = e->data;
+                       } else
+                               f.frametype = -1;
+                       break;
+
+               case VPB_TONEDETECT:
+                       if (e->data == VPB_BUSY || e->data == VPB_BUSY_308 || e->data == VPB_BUSY_AUST ) {
+                               f.subclass = AST_CONTROL_HANGUP;
+                               if (p->owner->_state == AST_STATE_UP) {
+                                       f.subclass = AST_CONTROL_HANGUP;
+                               }
+                               else {
+                                       f.subclass = AST_CONTROL_BUSY;
+                               }
+                       } else if (e->data == VPB_GRUNT) {
+                               if( ( get_time_in_ms() - p->lastgrunt ) > gruntdetect_timeout ) {
+                                       // Nothing heard on line for a very long time
+                                       // Timeout connection
+                                       if (option_verbose > 2) 
+                                               ast_verbose(VERBOSE_PREFIX_3 "grunt timeout\n");
+                                       ast_log(LOG_NOTICE,"Line hangup due of lack of conversation\n"); 
+                                       f.subclass = AST_CONTROL_HANGUP;
+                               } else {
+                                       p->lastgrunt = get_time_in_ms();
+                                       f.frametype = -1;
+                               }
+                       } else
+                               f.frametype = -1;
+                       break;
+
+               case VPB_CALLEND:
+                       #ifdef DIAL_WITH_CALL_PROGRESS
+                       if (e->data == VPB_CALL_CONNECTED) 
+                               f.subclass = AST_CONTROL_ANSWER;
+                       else if (e->data == VPB_CALL_NO_DIAL_TONE || e->data == VPB_CALL_NO_RING_BACK)
+                               f.subclass =  AST_CONTROL_CONGESTION;
+                       else if (e->data == VPB_CALL_NO_ANSWER || e->data == VPB_CALL_BUSY)
+                               f.subclass = AST_CONTROL_BUSY;
+                       else if (e->data  == VPB_CALL_DISCONNECTED) 
+                               f.subclass = AST_CONTROL_HANGUP;
+                       #else
+                       ast_log(LOG_NOTICE,"Got call progress callback but blind dialing on %s\n", p->dev); 
+                       f.frametype = -1;
+                       #endif
+                       break;
+
+               case VPB_STATION_OFFHOOK:
+                       f.subclass = AST_CONTROL_ANSWER;
+                       break;
+
+               /* not sure why this was commented out */         
+               case VPB_DROP:
+                       if (p->mode == MODE_FXO){ /* ignore loop drop on stations */
+                               if (p->owner->_state == AST_STATE_UP) 
+                                       f.subclass = AST_CONTROL_HANGUP;
+                               else
+                                       f.frametype = -1;
+                       }
+                       break;
+               /* */     
+               case VPB_STATION_ONHOOK:
                        f.subclass = AST_CONTROL_HANGUP;
                        f.subclass = AST_CONTROL_HANGUP;
+                       break;
+
+               case VPB_STATION_FLASH:
+                       f.subclass = AST_CONTROL_FLASH;
+                       break;
+
+               // Called when dialing has finished and ringing starts
+               // No indication that call has really been answered when using blind dialing
+               case VPB_DIALEND:
+                       f.subclass = AST_CONTROL_ANSWER;
+                       if (option_verbose > 1) 
+                               ast_verbose(VERBOSE_PREFIX_2 "Dialend on %s\n", p->dev);
+                       break;
+
+               case VPB_PLAY_UNDERFLOW:
+                       f.frametype = -1;
+                       vpb_reset_play_fifo_alarm(p->handle);
+                       break;
+
+               case VPB_RECORD_OVERFLOW:
+                       f.frametype = -1;
+                       vpb_reset_record_fifo_alarm(p->handle);
+                       break;
+
+               default:
+                       f.frametype = -1;
+                       break;
+       }
+
+       if (option_verbose > 3) 
+               ast_verbose(VERBOSE_PREFIX_4 "handle_owned: putting frame: [%d=>%d], bridge=%p\n",
+                       f.frametype, f.subclass, (void *)p->bridge);
+
+       ast_mutex_lock(&p->lock); {
+               if (p->bridge) { /* Check what happened, see if we need to report it. */
+                       switch (f.frametype) {
+                               case AST_FRAME_DTMF:
+                                       if (!(p->bridge->c0 == p->owner && 
+                                                       (p->bridge->flags & AST_BRIDGE_DTMF_CHANNEL_0) ) &&
+                                                       !(p->bridge->c1 == p->owner && 
+                                                       (p->bridge->flags & AST_BRIDGE_DTMF_CHANNEL_1) )) 
+                                               /* Kill bridge, this is interesting. */
+                                               endbridge = 1;
+                                       break;
+
+                               case AST_FRAME_CONTROL:
+                                       if (!(p->bridge->flags & AST_BRIDGE_IGNORE_SIGS)) 
+                                       #if 0
+                                       if (f.subclass == AST_CONTROL_BUSY ||
+                                       f.subclass == AST_CONTROL_CONGESTION ||
+                                       f.subclass == AST_CONTROL_HANGUP ||
+                                       f.subclass == AST_CONTROL_FLASH)
+                                       #endif
+                                               endbridge = 1;
+                                       break;
+
+                               default:
+                                       break;
+                       }
+                       if (endbridge) {
+                               if (p->bridge->fo)
+                                       *p->bridge->fo = ast_frisolate(&f);
+                               if (p->bridge->rc)
+                                       *p->bridge->rc = p->owner;
+
+                               ast_mutex_lock(&p->bridge->lock); {
+                                       p->bridge->endbridge = 1;
+                                       pthread_cond_signal(&p->bridge->cond);
+                               } ast_mutex_unlock(&p->bridge->lock);                      
+                       }         
                }
                }
-               else {
-                       f.subclass = AST_CONTROL_BUSY;
+       } ast_mutex_unlock(&p->lock);
+
+       if (endbridge) return 0;
+
+       // Trylock used here to avoid deadlock that can occur if we
+       // happen to be in here handling an event when hangup is called
+       // Problem is that hangup holds p->owner->lock
+       if (f.frametype >= 0 && f.frametype != AST_FRAME_NULL) {
+               if (ast_mutex_trylock(&p->owner->lock)==0)  {
+                       ast_queue_frame(p->owner, &f, 0);
+                       ast_mutex_unlock(&p->owner->lock);
+               } else {
+                       ast_verbose("Missed event %d/%d on %s\n",
+                       f.frametype, f.subclass, p->dev);
                }
                }
-         } else if (e->data == VPB_GRUNT) {
-              if( ( get_time_in_ms() - p->lastgrunt ) > gruntdetect_timeout ) {
-                  // Nothing heard on line for a very long time
-                  // Timeout connection
-                  if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "grunt timeout\n");
-                  ast_log(LOG_NOTICE,"Line hangup due of lack of conversation\n"); 
-                  f.subclass = AST_CONTROL_HANGUP;
-              } else {
-                  p->lastgrunt = get_time_in_ms();
-                  f.frametype = -1;
-              }
-         } else
-              f.frametype = -1;
-         break;
-
-     case VPB_CALLEND:
-#ifdef DIAL_WITH_CALL_PROGRESS
-         if (e->data == VPB_CALL_CONNECTED) 
-              f.subclass = AST_CONTROL_ANSWER;
-         else if (e->data == VPB_CALL_NO_DIAL_TONE ||
-                  e->data == VPB_CALL_NO_RING_BACK)
-              f.subclass =  AST_CONTROL_CONGESTION;
-         else if (e->data == VPB_CALL_NO_ANSWER ||
-                  e->data == VPB_CALL_BUSY)
-              f.subclass = AST_CONTROL_BUSY;
-         else if (e->data  == VPB_CALL_DISCONNECTED) 
-              f.subclass = AST_CONTROL_HANGUP;
-#else
-         ast_log(LOG_NOTICE,"Got call progress callback but blind dialing on %s\n", p->dev); 
-         f.frametype = -1;
-#endif
-         break;
-
-     case VPB_STATION_OFFHOOK:
-         f.subclass = AST_CONTROL_ANSWER;
-         break;
-/* not sure why this was commented out */        
-     case VPB_DROP:
-          if (p->mode == MODE_FXO){ /* ignore loop drop on stations */
-                 if (p->owner->_state == AST_STATE_UP) 
-                       f.subclass = AST_CONTROL_HANGUP;
-                 else
-                       f.frametype = -1;
-          }
-         break;
-/* */    
-     case VPB_STATION_ONHOOK:
-         f.subclass = AST_CONTROL_HANGUP;
-         break;
-         
-     case VPB_STATION_FLASH:
-         f.subclass = AST_CONTROL_FLASH;
-         break;
-       
-     // Called when dialing has finished and ringing starts
-     // No indication that call has really been answered when using blind dialing
-     case VPB_DIALEND:
-         f.subclass = AST_CONTROL_ANSWER;
-         if (option_verbose > 1) 
-             ast_verbose(VERBOSE_PREFIX_2 "Dialend on %s\n", p->dev);
-         break;
-
-     case VPB_PLAY_UNDERFLOW:
-         f.frametype = -1;
-         vpb_reset_play_fifo_alarm(p->handle);
-         break;
-     
-     case VPB_RECORD_OVERFLOW:
-         f.frametype = -1;
-         vpb_reset_record_fifo_alarm(p->handle);
-         break;
-
-     default:
-         f.frametype = -1;
-         break;
-     }
-
-     if (option_verbose > 3) 
-         ast_verbose(VERBOSE_PREFIX_4 "handle_owned: putting frame: [%d=>%d], bridge=%p\n",
-                     f.frametype, f.subclass, (void *)p->bridge);
-
-     ast_mutex_lock(&p->lock); {
-         if (p->bridge) { /* Check what happened, see if we need to report it. */
-              switch (f.frametype) { 
-              case AST_FRAME_DTMF:
-                   if (!(p->bridge->c0 == p->owner && 
-                         (p->bridge->flags & AST_BRIDGE_DTMF_CHANNEL_0) ) &&
-                       !(p->bridge->c1 == p->owner && 
-                         (p->bridge->flags & AST_BRIDGE_DTMF_CHANNEL_1) )) 
-                        /* Kill bridge, this is interesting. */
-                        endbridge = 1;
-                   break;
-                   
-              case AST_FRAME_CONTROL:
-                   if (!(p->bridge->flags & AST_BRIDGE_IGNORE_SIGS)) 
-#if 0
-                        if (f.subclass == AST_CONTROL_BUSY ||
-                            f.subclass == AST_CONTROL_CONGESTION ||
-                            f.subclass == AST_CONTROL_HANGUP ||
-                            f.subclass == AST_CONTROL_FLASH)
-#endif
-                             endbridge = 1;
-                   break;
-              default:
-                   
-                   break;
-              }
-              if (endbridge) {
-                   if (p->bridge->fo)
-                        *p->bridge->fo = ast_frisolate(&f);
-                   if (p->bridge->rc)
-                        *p->bridge->rc = p->owner;
-                   
-                   ast_mutex_lock(&p->bridge->lock); {
-                        p->bridge->endbridge = 1;
-                        pthread_cond_signal(&p->bridge->cond);
-                   } ast_mutex_unlock(&p->bridge->lock);                          
-              }          
-         }
-     } ast_mutex_unlock(&p->lock);
-     
-     if (endbridge) return 0;
-     
-     // Trylock used here to avoid deadlock that can occur if we
-     // happen to be in here handling an event when hangup is called
-     // Problem is that hangup holds p->owner->lock
-     if (f.frametype >= 0 && f.frametype != AST_FRAME_NULL) {
-         if (ast_mutex_trylock(&p->owner->lock)==0)  {
-               ast_queue_frame(p->owner, &f, 0);
-               ast_mutex_unlock(&p->owner->lock);
-        } else {
-               ast_verbose("Missed event %d/%d on %s\n",
-                     f.frametype, f.subclass, p->dev);
-        }
-     }
-     
-     return 0;
+       }
+
+       return 0;
 }
 
 static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e)
 {
 }
 
 static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e)
 {
-     char s[2] = {0};
-
-     if (option_verbose > 3) 
-         ast_verbose(VERBOSE_PREFIX_4 "%s: In not owned, mode=%d, [%d=>%d]\n",
-                     p->dev, p->mode, e->type, e->data);
-          
-     switch(e->type) {
-     case VPB_RING:
-         if (p->mode == MODE_FXO) /* FXO port ring, start * */ {
-             vpb_new(p, AST_STATE_RING, p->context);
-             get_callerid(p);  /* Australian Caller ID only between 1st and 2nd ring */
-         }
-         break;
-     case VPB_RING_OFF:
-         break;
-     case VPB_STATION_OFFHOOK:
-         if (p->mode == MODE_IMMEDIATE) 
-              vpb_new(p,AST_STATE_RING, p->context);
-         else {
-              ast_verbose(VERBOSE_PREFIX_4 "%s: In not owned, playing dialtone\n",p->dev);
-              playtone(p->handle, &Dialtone);
-              p->wantdtmf = 1;
-              p->ext[0] = 0;   /* Just to be sure & paranoid.*/
-               p->state=VPB_STATE_PLAYDIAL;
-         }
-         break;
-     case VPB_DIALEND:
-         if (p->mode == MODE_DIALTONE){
-               if (p->state == VPB_STATE_PLAYDIAL) {
-                   playtone(p->handle, &Dialtone);
-                  p->wantdtmf = 1;
-                  p->ext[0] = 0;       // Just to be sure & paranoid.
-               }
-/* These are not needed as they have timers to restart them
-               else if (p->state == VPB_STATE_PLAYBUSY) {
-                   playtone(p->handle, &Busytone);
-                  p->wantdtmf = 1;
-                  p->ext[0] = 0;       // Just to be sure & paranoid.
-               }
-               else if (p->state == VPB_STATE_PLAYRING) {
-                   playtone(p->handle, &Ringbacktone);
-                  p->wantdtmf = 1;
-                  p->ext[0] = 0;       // Just to be sure & paranoid.
-               }
-*/
-         }
-         break;
-
-     case VPB_STATION_ONHOOK:  /* clear ext */
-          stoptone(p->handle);
-         p->wantdtmf = 1 ;
-         p->ext[0] = 0;
-          p->state=VPB_STATE_ONHOOK;
-         break;
-
-     case VPB_DTMF:
-         if (p->wantdtmf == 1) {
-             stoptone(p->handle);
-            p->wantdtmf = 0;
-         }
-          p->state=VPB_STATE_GETDTMF;
-         s[0] = e->data;
-         strcat(p->ext, s);
-         
-         if (ast_exists_extension(NULL, p->context, p->ext, 1, p->callerid)) 
-              vpb_new(p,AST_STATE_RING, p->context);
-         else if (!ast_canmatch_extension(NULL, p->context, p->ext, 1, p->callerid)) 
-              if (ast_exists_extension(NULL, "default", p->ext, 1, p->callerid)) 
-                   vpb_new(p,AST_STATE_RING, "default");             
-              else if (!ast_canmatch_extension(NULL, "default", p->ext, 1, p->callerid)) {
-                   if (option_debug)
-                        ast_log(LOG_DEBUG, 
-                                "%s can't match anything in %s or default\n", 
-                                p->ext, p->context);
-                   playtone(p->handle, &Busytone);
-                   vpb_timer_start(p->busy_timer);
-                    p->state = VPB_STATE_PLAYBUSY;
-              }
-         
-         break;
-         
-     default:
-         /* Ignore.*/
-         break;
-     }
-     
-     if (option_verbose > 3) 
-        ast_verbose(VERBOSE_PREFIX_4 "%s: Done not owned, mode=%d, [%d=>%d]\n",
-                     p->dev, p->mode, e->type, e->data);
-     
-     return 0;
- }
+       char s[2] = {0};
+
+       if (option_verbose > 3) 
+               ast_verbose(VERBOSE_PREFIX_4 "%s: In not owned, mode=%d, [%d=>%d]\n",
+                       p->dev, p->mode, e->type, e->data);
+
+       switch(e->type) {
+               case VPB_RING:
+                       if (p->mode == MODE_FXO) /* FXO port ring, start * */ {
+                               vpb_new(p, AST_STATE_RING, p->context);
+                               get_callerid(p);        /* Australian Caller ID only between 1st and 2nd ring */
+                       }
+                       break;
+
+               case VPB_RING_OFF:
+                       break;
+
+               case VPB_STATION_OFFHOOK:
+                       if (p->mode == MODE_IMMEDIATE) 
+                               vpb_new(p,AST_STATE_RING, p->context);
+                       else {
+                               ast_verbose(VERBOSE_PREFIX_4 "%s: In not owned, playing dialtone\n",p->dev);
+                               playtone(p->handle, &Dialtone);
+                               p->wantdtmf = 1;
+                               p->ext[0] = 0;  /* Just to be sure & paranoid.*/
+                               p->state=VPB_STATE_PLAYDIAL;
+                       }
+                       break;
+
+               case VPB_DIALEND:
+                       if (p->mode == MODE_DIALTONE){
+                               if (p->state == VPB_STATE_PLAYDIAL) {
+                                       playtone(p->handle, &Dialtone);
+                                       p->wantdtmf = 1;
+                                       p->ext[0] = 0;  // Just to be sure & paranoid.
+                               }
+                               /* These are not needed as they have timers to restart them
+                               else if (p->state == VPB_STATE_PLAYBUSY) {
+                                       playtone(p->handle, &Busytone);
+                                       p->wantdtmf = 1;
+                                       p->ext[0] = 0;  // Just to be sure & paranoid.
+                               }
+                               else if (p->state == VPB_STATE_PLAYRING) {
+                                       playtone(p->handle, &Ringbacktone);
+                                       p->wantdtmf = 1;
+                                       p->ext[0] = 0;  // Just to be sure & paranoid.
+                               }
+                               */
+                       }
+                       break;
+
+               case VPB_STATION_ONHOOK:        /* clear ext */
+                       stoptone(p->handle);
+                       p->wantdtmf = 1 ;
+                       p->ext[0] = 0;
+                       p->state=VPB_STATE_ONHOOK;
+                       break;
+
+               case VPB_DTMF:
+                       if (p->wantdtmf == 1) {
+                               stoptone(p->handle);
+                               p->wantdtmf = 0;
+                       }
+                       p->state=VPB_STATE_GETDTMF;
+                       s[0] = e->data;
+                       strcat(p->ext, s);
+                       if (ast_exists_extension(NULL, p->context, p->ext, 1, p->callerid)) 
+                               vpb_new(p,AST_STATE_RING, p->context);
+                       else if (!ast_canmatch_extension(NULL, p->context, p->ext, 1, p->callerid)) 
+                       if (ast_exists_extension(NULL, "default", p->ext, 1, p->callerid)) 
+                               vpb_new(p,AST_STATE_RING, "default");         
+                       else if (!ast_canmatch_extension(NULL, "default", p->ext, 1, p->callerid)) {
+                               if (option_debug)
+                                       ast_log(LOG_DEBUG, "%s can't match anything in %s or default\n",
+                                                p->ext, p->context);
+                               playtone(p->handle, &Busytone);
+                               vpb_timer_start(p->busy_timer);
+                               p->state = VPB_STATE_PLAYBUSY;
+                       }
+                       break;
+
+               default:
+                       /* Ignore.*/
+                       break;
+       }
+
+       if (option_verbose > 3) 
+               ast_verbose(VERBOSE_PREFIX_4 "%s: Done not owned, mode=%d, [%d=>%d]\n",
+                       p->dev, p->mode, e->type, e->data);
+
+       return 0;
+}
 
 static void *do_monitor(void *unused)
 {
 
 static void *do_monitor(void *unused)
 {
-    
-     /* Monitor thread, doesn't die until explicitly killed. */
-     
-     if (option_verbose > 1) 
-         ast_verbose(VERBOSE_PREFIX_2 "Starting vpb monitor thread[%ld]\n",
-                     pthread_self());
 
 
-     pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-     
-     for(;;) {
-     
-         VPB_EVENT e;
-         VPB_EVENT je;
-         char str[VPB_MAX_STR];
-         struct vpb_pvt *p;
-         
-         //if (option_verbose > 4)
-         //     ast_verbose(VERBOSE_PREFIX_4 "Monitor waiting for event\n");
-              
-         int res = vpb_get_event_sync(&e, VPB_WAIT_TIMEOUT);
-         if( (res==VPB_NO_EVENTS) || (res==VPB_TIME_OUT) )
-               continue;
-               
-         if (res != VPB_OK) {
-               ast_log(LOG_ERROR,"Monitor get event error %s\n", vpb_strerror(res) );
-               ast_verbose("Monitor get event error %s\n", vpb_strerror(res) );
-               continue;
-         }
-         
-         str[0] = 0;
-         
-         p = NULL;
-         
-         ast_mutex_lock(&monlock); {
-               
-               vpb_translate_event(&e, str);
-              
-               if (e.type == VPB_NULL_EVENT) {
-                   if (option_verbose > 3)
-                       ast_verbose(VERBOSE_PREFIX_4 "Monitor got null event\n");
-                   goto done; /* Nothing to do, just a wakeup call.*/
-               }
-               if (strlen(str)>1){
-                       str[(strlen(str)-1)]='\0';
-               }
-                   
-               ast_mutex_lock(&iflock); {
-                   p = iflist;
-                   while (p && p->handle != e.handle)
-                       p = p->next;
-               } ast_mutex_unlock(&iflock);
-              
-               if (p && (option_verbose > 3))
-                   ast_verbose(VERBOSE_PREFIX_4 "Event [%d=>%s] on %s\n", 
-                               e.type, str, p ? p->dev : "null");
+       /* Monitor thread, doesn't die until explicitly killed. */
+
+       if (option_verbose > 1) 
+               ast_verbose(VERBOSE_PREFIX_2 "Starting vpb monitor thread[%ld]\n",
+       pthread_self());
 
 
-              done: (void)0;
+       pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
 
 
-         } ast_mutex_unlock(&monlock); 
+       for(;;) {
+               VPB_EVENT e;
+               VPB_EVENT je;
+               char str[VPB_MAX_STR];
+               struct vpb_pvt *p;
 
 
-         if (!p) {
-               if (e.type != VPB_NULL_EVENT){
-                       ast_log(LOG_WARNING, "Got event [%s][%d], no matching iface!\n", str,e.type);    
+               //if (option_verbose > 4)
+               //     ast_verbose(VERBOSE_PREFIX_4 "Monitor waiting for event\n");
+
+               int res = vpb_get_event_sync(&e, VPB_WAIT_TIMEOUT);
+               if( (res==VPB_NO_EVENTS) || (res==VPB_TIME_OUT) )
+                       continue;
+
+               if (res != VPB_OK) {
+                       ast_log(LOG_ERROR,"Monitor get event error %s\n", vpb_strerror(res) );
+                       ast_verbose("Monitor get event error %s\n", vpb_strerror(res) );
+                       continue;
                }
                }
-               continue;
-         } 
-          
-          /* flush the event from the channel event Q */
-          vpb_get_event_ch_async(e.handle,&je);
-
-         /* Two scenarios: Are you owned or not. */
-         ast_mutex_lock(&p->owner_lock);
-         if (p->owner) {
-             monitor_handle_owned(p, &e);
-             ast_mutex_unlock(&p->owner_lock);
-         } else {
-             ast_mutex_unlock(&p->owner_lock);
-             monitor_handle_notowned(p, &e);
-         }
-         
-     }
-     
-     return NULL;
+
+               str[0] = 0;
+
+               p = NULL;
+
+               ast_mutex_lock(&monlock); {
+                       vpb_translate_event(&e, str);
+
+                       if (e.type == VPB_NULL_EVENT) {
+                               if (option_verbose > 3)
+                                       ast_verbose(VERBOSE_PREFIX_4 "Monitor got null event\n");
+                               goto done; /* Nothing to do, just a wakeup call.*/
+                       }
+                       if (strlen(str)>1){
+                               str[(strlen(str)-1)]='\0';
+                       }
+
+                       ast_mutex_lock(&iflock); {
+                               p = iflist;
+                               while (p && p->handle != e.handle)
+                                       p = p->next;
+                       } ast_mutex_unlock(&iflock);
+
+                       if (p && (option_verbose > 3))
+                               ast_verbose(VERBOSE_PREFIX_4 "Event [%d=>%s] on %s\n", 
+                                       e.type, str, p ? p->dev : "null");
+                       done: (void)0;
+
+               } ast_mutex_unlock(&monlock); 
+
+               if (!p) {
+                       if (e.type != VPB_NULL_EVENT){
+                               ast_log(LOG_WARNING, "Got event [%s][%d], no matching iface!\n", str,e.type);    
+                       }
+                       continue;
+               } 
+
+               /* flush the event from the channel event Q */
+               vpb_get_event_ch_async(e.handle,&je);
+
+               /* Two scenarios: Are you owned or not. */
+               ast_mutex_lock(&p->owner_lock);
+               if (p->owner) {
+                       monitor_handle_owned(p, &e);
+                       ast_mutex_unlock(&p->owner_lock);
+               } else {
+                       ast_mutex_unlock(&p->owner_lock);
+                       monitor_handle_notowned(p, &e);
+               }
+
+       }
+
+       return NULL;
 }
 
 static int restart_monitor(void)
 {
 }
 
 static int restart_monitor(void)
 {
-     int error = 0;
-     
-     /* If we're supposed to be stopped -- stay stopped */
-     if (mthreadactive == -2)
-         return 0;
-
-     if (option_verbose > 3)
-       ast_verbose(VERBOSE_PREFIX_4 "Restarting monitor\n");
-
-     ast_mutex_lock(&monlock); {
-         if (monitor_thread == pthread_self()) {
-              ast_log(LOG_WARNING, "Cannot kill myself\n");
-              error = -1;
-              if (option_verbose > 3)
-                   ast_verbose(VERBOSE_PREFIX_4 "Monitor trying to kill monitor\n");
-              goto done;
-         }
-         if (mthreadactive != -1) {
-              /* Why do other drivers kill the thread? No need says I, simply awake thread with event. */
-              VPB_EVENT e;
-              e.handle = 0;
-              e.type = VPB_NULL_EVENT;
-              e.data = 0;
-              
-              if (option_verbose > 3)
-                   ast_verbose(VERBOSE_PREFIX_4 "Trying to reawake monitor\n");
-
-              vpb_put_event(&e);
-
-         } else {
-              /* Start a new monitor */
-              int pid = pthread_create(&monitor_thread, NULL, do_monitor, NULL); 
-              if (option_verbose > 3)
-                   ast_verbose(VERBOSE_PREFIX_4 "Created new monitor thread %d\n",pid);
-              if (pid < 0) {
-                   ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
-                   error = -1;
-                   goto done;
-              } else
-                   mthreadactive = 0; /* Started the thread!*/
-         }
-     done: (void)0;
-     } ast_mutex_unlock(&monlock);
-     
-     if (option_verbose > 3)
-       ast_verbose(VERBOSE_PREFIX_4 "Monitor restarted\n");
-     
-     return error;
+       int error = 0;
+
+       /* If we're supposed to be stopped -- stay stopped */
+       if (mthreadactive == -2)
+               return 0;
+
+       if (option_verbose > 3)
+               ast_verbose(VERBOSE_PREFIX_4 "Restarting monitor\n");
+
+       ast_mutex_lock(&monlock); {
+               if (monitor_thread == pthread_self()) {
+                       ast_log(LOG_WARNING, "Cannot kill myself\n");
+                       error = -1;
+                       if (option_verbose > 3)
+                               ast_verbose(VERBOSE_PREFIX_4 "Monitor trying to kill monitor\n");
+                       goto done;
+               }
+               if (mthreadactive != -1) {
+                       /* Why do other drivers kill the thread? No need says I, simply awake thread with event. */
+                       VPB_EVENT e;
+                       e.handle = 0;
+                       e.type = VPB_NULL_EVENT;
+                       e.data = 0;
+
+                       if (option_verbose > 3)
+                               ast_verbose(VERBOSE_PREFIX_4 "Trying to reawake monitor\n");
+
+                       vpb_put_event(&e);
+               } else {
+                       /* Start a new monitor */
+                       int pid = pthread_create(&monitor_thread, NULL, do_monitor, NULL); 
+                       if (option_verbose > 3)
+                               ast_verbose(VERBOSE_PREFIX_4 "Created new monitor thread %d\n",pid);
+                       if (pid < 0) {
+                               ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
+                               error = -1;
+                               goto done;
+                       } else
+                               mthreadactive = 0; /* Started the thread!*/
+               }
+               done: (void)0;
+       } ast_mutex_unlock(&monlock);
+
+       if (option_verbose > 3)
+               ast_verbose(VERBOSE_PREFIX_4 "Monitor restarted\n");
+
+       return error;
 }
 
 // Per board config that must be called after vpb_open()
 static void mkbrd(vpb_model_t model, int echo_cancel)
 {
 }
 
 // Per board config that must be called after vpb_open()
 static void mkbrd(vpb_model_t model, int echo_cancel)
 {
-     if(!bridges) {
-        if(model==vpb_model_v4pci) 
-           max_bridges = MAX_BRIDGES_V4PCI;
-       bridges = (vpb_bridge_t *)malloc(max_bridges * sizeof(vpb_bridge_t) );
-       if(!bridges) ast_log(LOG_ERROR, "Failed to initialize bridges\n");
-       else memset(bridges,0,max_bridges * sizeof(vpb_bridge_t));
-     }
-     if(!echo_cancel) {
-       if (model==vpb_model_v4pci) {
-               vpb_echo_canc_disable();
-               ast_log(LOG_NOTICE, "Voicetronix echo cancellation OFF\n");
-       } 
-       else {
-               /* need to it port by port for OpenSwitch*/
+       if(!bridges) {
+               if(model==vpb_model_v4pci) 
+                       max_bridges = MAX_BRIDGES_V4PCI;
+               bridges = (vpb_bridge_t *)malloc(max_bridges * sizeof(vpb_bridge_t) );
+               if(!bridges) 
+                       ast_log(LOG_ERROR, "Failed to initialize bridges\n");
+               else 
+                       memset(bridges,0,max_bridges * sizeof(vpb_bridge_t));
        }
        }
-     } else { 
-       if (model==vpb_model_v4pci) {
-               vpb_echo_canc_enable();
-               ast_log(LOG_NOTICE, "Voicetronix echo cancellation ON\n");
-       }
-       else {
+       if(!echo_cancel) {
+               if (model==vpb_model_v4pci) {
+                       vpb_echo_canc_disable();
+                       ast_log(LOG_NOTICE, "Voicetronix echo cancellation OFF\n");
+               } 
+               else {
+               /* need to it port by port for OpenSwitch*/
+               }
+       } else {
+               if (model==vpb_model_v4pci) {
+                       vpb_echo_canc_enable();
+                       ast_log(LOG_NOTICE, "Voicetronix echo cancellation ON\n");
+               }
+               else {
                /* need to it port by port for OpenSwitch*/
                /* need to it port by port for OpenSwitch*/
+               }
        }
        }
-     }
 }
 
 struct vpb_pvt *mkif(int board, int channel, int mode, float txgain, float rxgain,
                         float txswgain, float rxswgain, int bal1, int bal2, int bal3,
 }
 
 struct vpb_pvt *mkif(int board, int channel, int mode, float txgain, float rxgain,
                         float txswgain, float rxswgain, int bal1, int bal2, int bal3,
-                        char * callerid, int echo_cancel )
+                        char * callerid, int echo_cancel, int group )
 {
        struct vpb_pvt *tmp;
        char buf[64];
 {
        struct vpb_pvt *tmp;
        char buf[64];
@@ -932,6 +932,8 @@ struct vpb_pvt *mkif(int board, int channel, int mode, float txgain, float rxgai
 
        tmp->mode = mode;
 
 
        tmp->mode = mode;
 
+       tmp->group = group;
+
        strcpy(tmp->language, language);
        strcpy(tmp->context, context);
 
        strcpy(tmp->language, language);
        strcpy(tmp->context, context);
 
@@ -1006,41 +1008,40 @@ struct vpb_pvt *mkif(int board, int channel, int mode, float txgain, float rxgai
 
 static int vpb_indicate(struct ast_channel *ast, int condition)
 {
 
 static int vpb_indicate(struct ast_channel *ast, int condition)
 {
-    struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
-    int res = 0;
-
-    if (option_verbose > 3)
-       ast_verbose(VERBOSE_PREFIX_4 " vpb indicate on %s with %d\n",
-                   p->dev, condition);
-
-    switch(condition) {
-       case AST_CONTROL_BUSY:
-       case AST_CONTROL_CONGESTION:
-           playtone(p->handle, &Busytone);
-            p->state = VPB_STATE_PLAYBUSY;
-           vpb_timer_start(p->busy_timer); 
-           break;
-       case AST_CONTROL_RINGING:
-           playtone(p->handle, &Ringbacktone);
-           vpb_timer_start(p->ringback_timer);
-           break;          
-       case AST_CONTROL_ANSWER:
-       case -1: /* -1 means stop playing? */
-          vpb_timer_stop(p->ringback_timer);
-          vpb_timer_stop(p->busy_timer);
-           stoptone(p->handle);
-          break;
-       case AST_CONTROL_HANGUP:
-           playtone(p->handle, &Busytone);
-            p->state = VPB_STATE_PLAYBUSY;
-           vpb_timer_start(p->busy_timer);
-           break;
-           
-       default:
-           res = 0;
-           break;
-    }
-    return res;
+       struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
+       int res = 0;
+
+       if (option_verbose > 3)
+               ast_verbose(VERBOSE_PREFIX_4 " vpb indicate on %s with %d\n", p->dev, condition);
+
+       switch(condition) {
+               case AST_CONTROL_BUSY:
+               case AST_CONTROL_CONGESTION:
+                       playtone(p->handle, &Busytone);
+                       p->state = VPB_STATE_PLAYBUSY;
+                       vpb_timer_start(p->busy_timer); 
+                       break;
+               case AST_CONTROL_RINGING:
+                       playtone(p->handle, &Ringbacktone);
+                       vpb_timer_start(p->ringback_timer);
+                       break;      
+               case AST_CONTROL_ANSWER:
+               case -1: /* -1 means stop playing? */
+                       vpb_timer_stop(p->ringback_timer);
+                       vpb_timer_stop(p->busy_timer);
+                       stoptone(p->handle);
+                       break;
+               case AST_CONTROL_HANGUP:
+                       playtone(p->handle, &Busytone);
+                       p->state = VPB_STATE_PLAYBUSY;
+                       vpb_timer_start(p->busy_timer);
+                       break;
+
+               default:
+                       res = 0;
+                       break;
+       }
+       return res;
 }
 
 static int vpb_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock)
 }
 
 static int vpb_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock)
@@ -1066,431 +1067,417 @@ static int vpb_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, i
 
 static int vpb_digit(struct ast_channel *ast, char digit)
 {
 
 static int vpb_digit(struct ast_channel *ast, char digit)
 {
-    struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
-    char s[2];
+       struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
+       char s[2];
+
+       s[0] = digit;
+       s[1] = '\0';
 
 
-    s[0] = digit;
-    s[1] = '\0';
-    
-    ast_mutex_lock(&p->play_dtmf_lock);
-    strncat(p->play_dtmf,s,sizeof(*p->play_dtmf));
-    ast_mutex_unlock(&p->play_dtmf_lock);
+       ast_mutex_lock(&p->play_dtmf_lock);
+       strncat(p->play_dtmf,s,sizeof(*p->play_dtmf));
+       ast_mutex_unlock(&p->play_dtmf_lock);
 
 
-    return 0;
+       return 0;
 }
 
 
 static int vpb_call(struct ast_channel *ast, char *dest, int timeout)
 {
 }
 
 
 static int vpb_call(struct ast_channel *ast, char *dest, int timeout)
 {
-    struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
-    int res = 0;
-    char *s = strrchr(dest, '/');
+       struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
+       int res = 0;
+       char *s = strrchr(dest, '/');
 
 
-    if (s)
-        s = s + 1;
-    else
-        s = dest;
+       if (s)
+               s = s + 1;
+       else
+               s = dest;
 
 
-    if (ast->_state != AST_STATE_DOWN && ast->_state != AST_STATE_RESERVED) {
-       ast_log(LOG_WARNING, "vpb_call on %s neither down nor reserved!\n", 
+       if (ast->_state != AST_STATE_DOWN && ast->_state != AST_STATE_RESERVED) {
+               ast_log(LOG_WARNING, "vpb_call on %s neither down nor reserved!\n", 
                ast->name);
                ast->name);
-       return -1;
-    }
-    if (p->mode != MODE_FXO)  /* Station port, ring it. */
-       res = vpb_ring_station_async(p->handle, VPB_RING_STATION_ON,0);       
-     else {
-         VPB_CALL call;
-
-         // Dial must timeout or it can leave channels unuseable
-         if( timeout == 0 )  timeout = TIMER_PERIOD_NOANSWER;
-         else timeout = timeout * 1000; //convert from secs to ms.
-               
-         // These timeouts are only used with call progress dialing
-         call.dialtones = 1; // Number of dialtones to get outside line
-         call.dialtone_timeout = VPB_DIALTONE_WAIT; // Wait this long for dialtone (ms)
-         call.ringback_timeout = VPB_RINGWAIT; // Wait this long for ringing after dialing (ms)
-         call.inter_ringback_timeout = VPB_CONNECTED_WAIT; // If ringing stops for this long consider it connected (ms)
-         call.answer_timeout = timeout; // Time to wait for answer after ringing starts (ms)
-         memcpy( &call.tone_map,  DialToneMap, sizeof(DialToneMap) );
-         vpb_set_call(p->handle, &call);
-
-         if (option_verbose > 1)
-              ast_verbose(VERBOSE_PREFIX_2 "Calling %s on %s \n", 
-                          s, ast->name); 
-         
-         if (option_verbose > 2) {
-               int j;
-               ast_verbose(VERBOSE_PREFIX_2 "Dial parms for %s %d/%dms/%dms/%dms/%dms\n"
-                       , ast->name, call.dialtones, call.dialtone_timeout
-                       , call.ringback_timeout, call.inter_ringback_timeout
-                       , call.answer_timeout );
-               for( j=0; !call.tone_map[j].terminate; j++ )
-                       ast_verbose(VERBOSE_PREFIX_2 "Dial parms for %s tone %d->%d\n", 
-                          ast->name, call.tone_map[j].tone_id, call.tone_map[j].call_id); 
-         }
-
-         vpb_sethook_sync(p->handle,VPB_OFFHOOK);
-         
-#ifndef DIAL_WITH_CALL_PROGRESS
-         vpb_sleep(300);
-         res = vpb_dial_async(p->handle, s);
-#else
-         res = vpb_call_async(p->handle, s);
-#endif
-         
-         if (res != VPB_OK) {
-           ast_log(LOG_DEBUG, "Call on %s to %s failed: %s\n", 
-                   ast->name, s, vpb_strerror(res));         
-           res = -1;
-         } else 
-           res = 0;
-    }
-
-    if (option_verbose > 2)
-       ast_verbose(VERBOSE_PREFIX_3
-                   " VPB Calling %s [t=%d] on %s returned %d\n", 
-                   s, timeout, ast->name, res); 
-
-    if (res == 0) {
-        ast_setstate(ast, AST_STATE_RINGING);
-        ast_queue_control(ast,AST_CONTROL_RINGING, 0);         
-    }
-
-    pthread_create(&p->readthread, NULL, do_chanreads, (void *)p);
-
-    return res;
+               return -1;
+       }
+       if (p->mode != MODE_FXO)  /* Station port, ring it. */
+               res = vpb_ring_station_async(p->handle, VPB_RING_STATION_ON,0);       
+       else {
+               VPB_CALL call;
+
+               // Dial must timeout or it can leave channels unuseable
+               if( timeout == 0 )
+                       timeout = TIMER_PERIOD_NOANSWER;
+               else 
+                       timeout = timeout * 1000; //convert from secs to ms.
+
+               // These timeouts are only used with call progress dialing
+               call.dialtones = 1; // Number of dialtones to get outside line
+               call.dialtone_timeout = VPB_DIALTONE_WAIT; // Wait this long for dialtone (ms)
+               call.ringback_timeout = VPB_RINGWAIT; // Wait this long for ringing after dialing (ms)
+               call.inter_ringback_timeout = VPB_CONNECTED_WAIT; // If ringing stops for this long consider it connected (ms)
+               call.answer_timeout = timeout; // Time to wait for answer after ringing starts (ms)
+               memcpy( &call.tone_map,  DialToneMap, sizeof(DialToneMap) );
+               vpb_set_call(p->handle, &call);
+
+               if (option_verbose > 1)
+                       ast_verbose(VERBOSE_PREFIX_2 "Calling %s on %s \n", s, ast->name); 
+
+               if (option_verbose > 2) {
+                       int j;
+                       ast_verbose(VERBOSE_PREFIX_2 "Dial parms for %s %d/%dms/%dms/%dms/%dms\n"
+                               , ast->name, call.dialtones, call.dialtone_timeout
+                               , call.ringback_timeout, call.inter_ringback_timeout
+                               , call.answer_timeout );
+                       for( j=0; !call.tone_map[j].terminate; j++ )
+                               ast_verbose(VERBOSE_PREFIX_2 "Dial parms for %s tone %d->%d\n", 
+                                       ast->name, call.tone_map[j].tone_id, call.tone_map[j].call_id); 
+               }
+
+               vpb_sethook_sync(p->handle,VPB_OFFHOOK);
+
+               #ifndef DIAL_WITH_CALL_PROGRESS
+               vpb_sleep(300);
+               res = vpb_dial_async(p->handle, s);
+               #else
+               res = vpb_call_async(p->handle, s);
+               #endif
+
+               if (res != VPB_OK) {
+                       ast_log(LOG_DEBUG, "Call on %s to %s failed: %s\n", ast->name, s, vpb_strerror(res));         
+                       res = -1;
+               } else 
+                       res = 0;
+       }
+
+       if (option_verbose > 2)
+               ast_verbose(VERBOSE_PREFIX_3 " VPB Calling %s [t=%d] on %s returned %d\n", s, timeout, ast->name, res); 
+       if (res == 0) {
+               ast_setstate(ast, AST_STATE_RINGING);
+               ast_queue_control(ast,AST_CONTROL_RINGING, 0);          
+       }
+
+       pthread_create(&p->readthread, NULL, do_chanreads, (void *)p);
+
+       return res;
 }
 
 static int vpb_hangup(struct ast_channel *ast)
 {
 }
 
 static int vpb_hangup(struct ast_channel *ast)
 {
-    struct vpb_pvt *p;
+       struct vpb_pvt *p;
+
+       if (option_verbose > 1) 
+               ast_verbose(VERBOSE_PREFIX_2 "Hangup on %s requested\n", ast->name);
 
 
-    if (option_verbose > 1) 
-       ast_verbose(VERBOSE_PREFIX_2 "Hangup on %s requested\n", ast->name);
-    
-    if (!ast->pvt || !ast->pvt->pvt) {
-       ast_log(LOG_WARNING, "channel (%s) not connected?\n", ast->name);
+       if (!ast->pvt || !ast->pvt->pvt) {
+               ast_log(LOG_WARNING, "channel (%s) not connected?\n", ast->name);
+               return 0;
+       }
+
+       ast_setstate(ast,AST_STATE_DOWN);
+
+       p = (struct vpb_pvt *)ast->pvt->pvt;
+
+       /* Stop record */
+       p->stopreads = 1;
+       if( p->readthread )
+               pthread_join(p->readthread, NULL); 
+
+       /* Stop play */
+       if (p->lastoutput != -1) {
+               if(option_verbose>1) 
+                       ast_verbose( VERBOSE_PREFIX_2 "Ending play mode on %s\n",p->dev);
+               vpb_play_terminate(p->handle);
+               ast_mutex_lock(&p->play_lock); {
+                       vpb_play_buf_finish(p->handle);
+               } ast_mutex_unlock(&p->play_lock);
+       }
+
+       if (p->mode != MODE_FXO) { /* station port. */
+               vpb_ring_station_async(p->handle, VPB_RING_STATION_OFF,0);      
+               playtone(p->handle, &Busytone);
+               p->state = VPB_STATE_PLAYBUSY;
+       } else {
+               stoptone(p->handle); // Terminates any dialing
+               vpb_sethook_sync(p->handle, VPB_ONHOOK);
+       }
+
+       p->readthread = 0;
+       p->lastoutput = -1;
+       p->lastinput = -1;
+       p->last_ignore_dtmf = 1;
+       p->ext[0]  = 0;
+       p->dialtone = 0;
+
+       ast_mutex_lock(&p->owner_lock); {
+               p->owner = NULL;
+               ast->pvt->pvt = NULL;    
+       } ast_mutex_unlock(&p->owner_lock);
+
+       ast_mutex_lock(&usecnt_lock); {
+               usecnt--;
+       } ast_mutex_unlock(&usecnt_lock);
+       ast_update_use_count();
+
+       if (option_verbose > 1)
+               ast_verbose(VERBOSE_PREFIX_2 "Hangup on %s complete\n", ast->name);
+
+       restart_monitor();
        return 0;
        return 0;
-    }
-
-    ast_setstate(ast,AST_STATE_DOWN);
-
-    p = (struct vpb_pvt *)ast->pvt->pvt;
-
-    /* Stop record */
-    p->stopreads = 1;
-    if( p->readthread )
-       pthread_join(p->readthread, NULL); 
-
-    /* Stop play */
-    if (p->lastoutput != -1) {
-        if(option_verbose>1) 
-            ast_verbose( VERBOSE_PREFIX_2 "Ending play mode on %s\n",p->dev);
-       vpb_play_terminate(p->handle);
-       ast_mutex_lock(&p->play_lock); {
-           vpb_play_buf_finish(p->handle);
-       } ast_mutex_unlock(&p->play_lock);
-    }
-    
-    if (p->mode != MODE_FXO) { /* station port. */
-       vpb_ring_station_async(p->handle, VPB_RING_STATION_OFF,0);      
-       playtone(p->handle, &Busytone);
-        p->state = VPB_STATE_PLAYBUSY;
-
-    } else {
-       stoptone(p->handle); // Terminates any dialing
-       vpb_sethook_sync(p->handle, VPB_ONHOOK);
-    }
-    
-    p->readthread = 0;
-    p->lastoutput = -1;
-    p->lastinput = -1;
-    p->last_ignore_dtmf = 1;
-    p->ext[0]  = 0;
-    p->dialtone = 0;
-
-    ast_mutex_lock(&p->owner_lock); {
-       p->owner = NULL;
-        ast->pvt->pvt = NULL;   
-    } ast_mutex_unlock(&p->owner_lock);
-        
-    ast_mutex_lock(&usecnt_lock); {
-       usecnt--;
-    } ast_mutex_unlock(&usecnt_lock);
-    ast_update_use_count();
-
-    if (option_verbose > 1)
-       ast_verbose(VERBOSE_PREFIX_2 "Hangup on %s complete\n", ast->name);
-    
-    restart_monitor();
-
-    return 0;
 }
 
 static int vpb_answer(struct ast_channel *ast)
 {
 }
 
 static int vpb_answer(struct ast_channel *ast)
 {
-    struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
+       struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
 
 
-    if (p->mode == MODE_FXO)
-       vpb_sethook_sync(p->handle, VPB_OFFHOOK);
+       if (p->mode == MODE_FXO)
+               vpb_sethook_sync(p->handle, VPB_OFFHOOK);
 
 
-    if(option_verbose>1) 
-        ast_verbose( VERBOSE_PREFIX_2 "Answered call from %s on %s\n", p->owner->callerid, ast->name);
+       if(option_verbose>1) 
+               ast_verbose( VERBOSE_PREFIX_2 "Answered call from %s on %s\n", p->owner->callerid, ast->name);
 
 
-    ast->rings = 0;
-
-    pthread_create(&p->readthread, NULL, do_chanreads, (void *)p);
-    
-    return 0;
+       ast->rings = 0;
+       pthread_create(&p->readthread, NULL, do_chanreads, (void *)p);
+       return 0;
 }
 
 static struct ast_frame  *vpb_read(struct ast_channel *ast)
 {
 }
 
 static struct ast_frame  *vpb_read(struct ast_channel *ast)
 {
-    struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt; 
-    static struct ast_frame f = {AST_FRAME_NULL}; 
-    
-    f.src = type;
-    ast_log(LOG_NOTICE, "vpb_read should never be called (chan=%s)!\n", p->dev);
-       
-    return &f;
+       struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt; 
+       static struct ast_frame f = {AST_FRAME_NULL}; 
+
+       f.src = type;
+       ast_log(LOG_NOTICE, "vpb_read should never be called (chan=%s)!\n", p->dev);
+
+       return &f;
 }
 
 static inline int ast2vpbformat(int ast_format)
 {
 }
 
 static inline int ast2vpbformat(int ast_format)
 {
-
-    switch(ast_format) {
-       case AST_FORMAT_ALAW:
-           return VPB_ALAW;
-       case AST_FORMAT_SLINEAR:
-           return VPB_LINEAR;
-       case AST_FORMAT_ULAW:
-           return VPB_MULAW;
-       case AST_FORMAT_ADPCM:
-
-           return VPB_OKIADPCM;
-       default:
-           return -1;
-    }
+       switch(ast_format) {
+               case AST_FORMAT_ALAW:
+                       return VPB_ALAW;
+               case AST_FORMAT_SLINEAR:
+                       return VPB_LINEAR;
+               case AST_FORMAT_ULAW:
+                       return VPB_MULAW;
+               case AST_FORMAT_ADPCM:
+                       return VPB_OKIADPCM;
+               default:
+                       return -1;
+       }
 }
 
 static inline int astformatbits(int ast_format)
 {
 }
 
 static inline int astformatbits(int ast_format)
 {
-
-    switch(ast_format) {
-       case AST_FORMAT_ALAW:
-       case AST_FORMAT_ULAW:
-           return 8;
-       case AST_FORMAT_SLINEAR:
-           return 16;
-       case AST_FORMAT_ADPCM:
-           return 4;
-       default:
-           return 8;
-    }   
+       switch(ast_format) {
+               case AST_FORMAT_ALAW:
+               case AST_FORMAT_ULAW:
+                       return 8;
+               case AST_FORMAT_SLINEAR:
+                       return 16;
+               case AST_FORMAT_ADPCM:
+                       return 4;
+               default:
+                       return 8;
+       }   
 }
 
 int gain_vector(float g, short *v, int n) {
 }
 
 int gain_vector(float g, short *v, int n) {
-        int i;
+       int i;
        float tmp;
        for ( i = 0; i<n; i++) {
        float tmp;
        for ( i = 0; i<n; i++) {
-           tmp = g*v[i];
-           if (tmp > 32767.0)
-             tmp = 32767.0;
-           if (tmp < -32768.0)
-             tmp = -32768.0;
-           v[i] = (short)tmp;  
+               tmp = g*v[i];
+               if (tmp > 32767.0)
+                       tmp = 32767.0;
+               if (tmp < -32768.0)
+                       tmp = -32768.0;
+               v[i] = (short)tmp;      
        }  
        return(i);
        }  
        return(i);
-}        
+}
 
 static int vpb_write(struct ast_channel *ast, struct ast_frame *frame)
 {
 
 static int vpb_write(struct ast_channel *ast, struct ast_frame *frame)
 {
-    struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt; 
-    int res = 0, fmt = 0;
+       struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt; 
+       int res = 0, fmt = 0;
+
+       if (frame->frametype != AST_FRAME_VOICE) {
+               if(option_verbose>3) 
+                       ast_verbose( VERBOSE_PREFIX_4 "Don't know how to handle from type %d\n", frame->frametype);
+               return 0;
+       } else if (ast->_state != AST_STATE_UP) {
+               if(option_verbose>3) 
+                       ast_verbose( VERBOSE_PREFIX_4 "Writing frame type [%d,%d] on chan %s not up\n", frame->frametype, frame->subclass, ast->name);
+               return 0;
+       }
 
 
-    if (frame->frametype != AST_FRAME_VOICE) {
-       if(option_verbose>3) ast_verbose( VERBOSE_PREFIX_4 "Don't know how to handle from type %d\n", frame->frametype);
-       return 0;
-    } else if (ast->_state != AST_STATE_UP) {
-       if(option_verbose>3) ast_verbose( VERBOSE_PREFIX_4 "Writing frame type [%d,%d] on chan %s not up\n",
-                   frame->frametype, frame->subclass, ast->name);
+       fmt = ast2vpbformat(frame->subclass);
+       if (fmt < 0) {
+               ast_log(LOG_WARNING, "vpb_write Cannot handle frames of %d format!\n", frame->subclass);
+               return -1;
+       }
+
+       ast_mutex_lock(&p->play_lock);
+
+       if (p->lastoutput == -1) {
+               vpb_play_buf_start(p->handle, fmt);
+               if(option_verbose>1) 
+                       ast_verbose( VERBOSE_PREFIX_2 "Starting play mode on %s (codec=%d)\n",p->dev,fmt);
+       } else if (p->lastoutput != fmt) {
+               vpb_play_buf_finish(p->handle);
+               vpb_play_buf_start(p->handle, fmt);
+               if(option_verbose>1) 
+                       ast_verbose( VERBOSE_PREFIX_2 "Changed play format on %s (%d=>%d)\n",p->dev,p->lastoutput,fmt);
+       }
+
+       p->lastoutput = fmt;
+
+       // Apply extra gain !
+       if( p->txswgain > MAX_VPB_GAIN )
+               gain_vector(p->txswgain - MAX_VPB_GAIN , (short*)frame->data, frame->datalen/sizeof(short));
+
+       res = vpb_play_buf_sync(p->handle, (char*)frame->data, frame->datalen);
+       if( (res == VPB_OK) && (option_verbose > 4) ) {
+               short * data = (short*)frame->data;
+               ast_verbose("Write chan %s: (codec=%d) %d %d\n", p->dev, fmt, data[0],data[1]);
+       }
+
+       ast_mutex_unlock(&p->play_lock);
        return 0;
        return 0;
-    }
-
-    fmt = ast2vpbformat(frame->subclass);
-    if (fmt < 0) {
-       ast_log(LOG_WARNING, "vpb_write Cannot handle frames of %d format!\n", 
-               frame->subclass);
-       return -1;
-    }
-    
-    ast_mutex_lock(&p->play_lock);
-    
-    if (p->lastoutput == -1) {
-       vpb_play_buf_start(p->handle, fmt);
-        if(option_verbose>1) 
-           ast_verbose( VERBOSE_PREFIX_2 "Starting play mode on %s (codec=%d)\n",p->dev,fmt);
-    } else if (p->lastoutput != fmt) {
-        vpb_play_buf_finish(p->handle);
-        vpb_play_buf_start(p->handle, fmt);
-        if(option_verbose>1) 
-           ast_verbose( VERBOSE_PREFIX_2 "Changed play format on %s (%d=>%d)\n",p->dev,p->lastoutput,fmt);
-    }
-    
-    p->lastoutput = fmt;
-    
-    // Apply extra gain !
-    if( p->txswgain > MAX_VPB_GAIN )
-       gain_vector(p->txswgain - MAX_VPB_GAIN , (short*)frame->data, frame->datalen/sizeof(short));
-
-    res = vpb_play_buf_sync(p->handle, (char*)frame->data, frame->datalen);
-    if( (res == VPB_OK) && (option_verbose > 4) ) {
-       short * data = (short*)frame->data;
-       ast_verbose("Write chan %s: (codec=%d) %d %d\n", p->dev, fmt, data[0],data[1]);
-    }
-    
-    ast_mutex_unlock(&p->play_lock);
-    
-    return 0;
 }
 
 /* Read monitor thread function. */
 static void *do_chanreads(void *pvt)
 {
 }
 
 /* Read monitor thread function. */
 static void *do_chanreads(void *pvt)
 {
-     struct vpb_pvt *p = (struct vpb_pvt *)pvt;
-     struct ast_frame *fr = &p->fr;
-     char *readbuf = ((char *)p->buf) + AST_FRIENDLY_OFFSET;
-     int bridgerec = 0;
-     int afmt, readlen, res, fmt;
-     int ignore_dtmf;
-     char * getdtmf_var = NULL;
-     
-     fr->frametype = AST_FRAME_VOICE;
-     fr->src = type;
-     fr->mallocd = 0;
-     fr->samples = VPB_SAMPLES;
-     fr->offset = AST_FRIENDLY_OFFSET;
-     memset(p->buf, 0, sizeof p->buf);
-     
-     ast_mutex_lock(&p->record_lock);
-
-     p->stopreads = 0; 
-     while (!p->stopreads && p->owner) {
-
-        ast_mutex_lock(&p->lock); {
-             if (p->bridge) 
-                  if (p->bridge->c0 == p->owner && 
-                      (p->bridge->flags & AST_BRIDGE_REC_CHANNEL_0))
-                       bridgerec = 1;
-                  else if (p->bridge->c1 == p->owner && 
-                      (p->bridge->flags & AST_BRIDGE_REC_CHANNEL_1))
-                       bridgerec = 1;
-                  else 
-                       bridgerec = 0;
-             else
-                  bridgerec = 1;
-        } ast_mutex_unlock(&p->lock);
-        
-        if ( (p->owner->_state != AST_STATE_UP) || !bridgerec) {
-             vpb_sleep(10);
-             continue;
-        }
-        
-        // Voicetronix DTMF detection can be triggered off ordinary speech
-        // This leads to annoying beeps during the conversation
-        // Avoid this problem by just setting VPB_GETDTMF when you want to listen for DTMF
-        //ignore_dtmf = 1;
-        ignore_dtmf = 0; /* set this to 1 to turn this feature on */
-        getdtmf_var = pbx_builtin_getvar_helper(p->owner,"VPB_GETDTMF");
-        if( getdtmf_var && ( strcasecmp( getdtmf_var, "yes" ) == 0 ) )
-               ignore_dtmf = 0;
-               
-        if( ignore_dtmf != p->last_ignore_dtmf ) {
-              if(option_verbose>1) 
-                 ast_verbose( VERBOSE_PREFIX_2 "Now %s DTMF on %s\n",
-                       ignore_dtmf ? "ignoring" : "listening for", p->dev);
-             vpb_set_event_mask(p->handle, ignore_dtmf ? VPB_EVENTS_NODTMF : VPB_EVENTS_ALL );
-        }
-        p->last_ignore_dtmf = ignore_dtmf;
-        
-        // Play DTMF digits here to avoid problem you get if playing a digit during
-        // a record operation
-        ast_mutex_lock(&p->play_dtmf_lock);
-        if( p->play_dtmf[0] ) {
-             // Try to ignore DTMF event we get after playing digit
-             // This DTMF is played by asterisk and leads to an annoying trailing beep on CISCO phones
-             if( !ignore_dtmf) vpb_set_event_mask(p->handle, VPB_EVENTS_NODTMF );
-             vpb_dial_sync(p->handle,p->play_dtmf);
-              if(option_verbose>1) 
-                 ast_verbose( VERBOSE_PREFIX_2 "Played on %s DTMF %s\n",p->dev,p->play_dtmf);
-             p->play_dtmf[0] = '\0';
-             ast_mutex_unlock(&p->play_dtmf_lock);
-             vpb_sleep(700); // Long enough to miss echo and DTMF event
-             if( !ignore_dtmf) vpb_set_event_mask(p->handle, VPB_EVENTS_ALL );
-             continue;
-        }
-        ast_mutex_unlock(&p->play_dtmf_lock);
-
-        afmt = (p->owner) ? p->owner->pvt->rawreadformat : AST_FORMAT_SLINEAR;
-        fmt = ast2vpbformat(afmt);
-        if (fmt < 0) {
-           ast_log(LOG_WARNING,"Record failure on %s (unsupported format %d)\n", p->dev, afmt);
-           return NULL;
-        }
-        readlen = VPB_SAMPLES * astformatbits(afmt) / 8;
-
-        if (p->lastinput == -1) {
-           vpb_record_buf_start(p->handle, fmt);
-           vpb_reset_record_fifo_alarm(p->handle);
-            if(option_verbose>1) 
-               ast_verbose( VERBOSE_PREFIX_2 "Starting record mode on %s (codec=%d)\n",p->dev,fmt);
-        } else if (p->lastinput != fmt) {
-           vpb_record_buf_finish(p->handle);
-           vpb_record_buf_start(p->handle, fmt);
-            if(option_verbose>1) 
-               ast_verbose( VERBOSE_PREFIX_2 "Changed record format on %s (%d=>%d)\n",p->dev,p->lastinput,fmt);
-        }
-        p->lastinput = fmt;
-
-         /* Read only if up and not bridged, or a bridge for which we can read. */
-        if( (res = vpb_record_buf_sync(p->handle, readbuf, readlen) ) == VPB_OK ) {
-
-            // Apply extra gain !
-            if( p->rxswgain > MAX_VPB_GAIN )
-               gain_vector(p->rxswgain - MAX_VPB_GAIN , (short*)readbuf, readlen/sizeof(short));
-
-            fr->subclass = afmt;
-            fr->data = readbuf;
-            fr->datalen = readlen;
-
-            // Using trylock here to prevent deadlock when channel is hungup
-            // (ast_hangup() immediately gets lock)
-            if (p->owner && (ast_mutex_trylock(&p->owner->lock)==0) ) {
-               ast_queue_frame(p->owner, fr, 0);
-               ast_mutex_unlock(&p->owner->lock);
-               if (option_verbose > 4) {
-                   short * data = (short*)readbuf;
-                   ast_verbose("Read channel %s (codec=%d) %d %d\n", p->dev, fmt, data[0], data[1] );     
-               }  
-            }
-        } else {
-            ast_log(LOG_WARNING,"Record failure on %s (%s)\n", p->dev, vpb_strerror(res));
-            vpb_record_buf_finish(p->handle);
-            vpb_record_buf_start(p->handle, fmt);
-        }
-
-     }
-     
-     /* When stopreads seen, go away! */
-     vpb_record_buf_finish(p->handle);
-     
-     ast_mutex_unlock(&p->record_lock);
+       struct vpb_pvt *p = (struct vpb_pvt *)pvt;
+       struct ast_frame *fr = &p->fr;
+       char *readbuf = ((char *)p->buf) + AST_FRIENDLY_OFFSET;
+       int bridgerec = 0;
+       int afmt, readlen, res, fmt;
+       int ignore_dtmf;
+       char * getdtmf_var = NULL;
+
+       fr->frametype = AST_FRAME_VOICE;
+       fr->src = type;
+       fr->mallocd = 0;
+       fr->samples = VPB_SAMPLES;
+       fr->offset = AST_FRIENDLY_OFFSET;
+       memset(p->buf, 0, sizeof p->buf);
+
+       ast_mutex_lock(&p->record_lock);
+
+       p->stopreads = 0; 
+       while (!p->stopreads && p->owner) {
+
+               ast_mutex_lock(&p->lock); {
+                       if (p->bridge) {
+                               if (p->bridge->c0 == p->owner && (p->bridge->flags & AST_BRIDGE_REC_CHANNEL_0))
+                                       bridgerec = 1;
+                               else if (p->bridge->c1 == p->owner && (p->bridge->flags & AST_BRIDGE_REC_CHANNEL_1))
+                                       bridgerec = 1;
+                               else 
+                                       bridgerec = 0;
+                       } else {
+                               bridgerec = 1;
+                       }
+               } ast_mutex_unlock(&p->lock);
+
+               if ( (p->owner->_state != AST_STATE_UP) || !bridgerec) {
+                       vpb_sleep(10);
+                       continue;
+               }
+
+               // Voicetronix DTMF detection can be triggered off ordinary speech
+               // This leads to annoying beeps during the conversation
+               // Avoid this problem by just setting VPB_GETDTMF when you want to listen for DTMF
+               //ignore_dtmf = 1;
+               ignore_dtmf = 0; /* set this to 1 to turn this feature on */
+               getdtmf_var = pbx_builtin_getvar_helper(p->owner,"VPB_GETDTMF");
+               if( getdtmf_var && ( strcasecmp( getdtmf_var, "yes" ) == 0 ) )
+                       ignore_dtmf = 0;
+
+               if( ignore_dtmf != p->last_ignore_dtmf ) {
+                       if(option_verbose>1) 
+                               ast_verbose( VERBOSE_PREFIX_2 "Now %s DTMF on %s\n",
+                                       ignore_dtmf ? "ignoring" : "listening for", p->dev);
+                       vpb_set_event_mask(p->handle, ignore_dtmf ? VPB_EVENTS_NODTMF : VPB_EVENTS_ALL );
+               }
+               p->last_ignore_dtmf = ignore_dtmf;
+
+               // Play DTMF digits here to avoid problem you get if playing a digit during
+               // a record operation
+               ast_mutex_lock(&p->play_dtmf_lock);
+               if( p->play_dtmf[0] ) {
+                       // Try to ignore DTMF event we get after playing digit
+                       // This DTMF is played by asterisk and leads to an annoying trailing beep on CISCO phones
+                       if( !ignore_dtmf) 
+                               vpb_set_event_mask(p->handle, VPB_EVENTS_NODTMF );
+                       vpb_dial_sync(p->handle,p->play_dtmf);
+                       if(option_verbose>1) 
+                               ast_verbose( VERBOSE_PREFIX_2 "Played on %s DTMF %s\n",p->dev,p->play_dtmf);
+                       p->play_dtmf[0] = '\0';
+                       ast_mutex_unlock(&p->play_dtmf_lock);
+                       vpb_sleep(700); // Long enough to miss echo and DTMF event
+                       if( !ignore_dtmf) 
+                               vpb_set_event_mask(p->handle, VPB_EVENTS_ALL );
+                       continue;
+               }
+               ast_mutex_unlock(&p->play_dtmf_lock);
+
+               afmt = (p->owner) ? p->owner->pvt->rawreadformat : AST_FORMAT_SLINEAR;
+               fmt = ast2vpbformat(afmt);
+               if (fmt < 0) {
+                       ast_log(LOG_WARNING,"Record failure on %s (unsupported format %d)\n", p->dev, afmt);
+                       return NULL;
+               }
+               readlen = VPB_SAMPLES * astformatbits(afmt) / 8;
+
+               if (p->lastinput == -1) {
+                       vpb_record_buf_start(p->handle, fmt);
+                       vpb_reset_record_fifo_alarm(p->handle);
+                       if(option_verbose>1) 
+                               ast_verbose( VERBOSE_PREFIX_2 "Starting record mode on %s (codec=%d)\n",p->dev,fmt);
+               } else if (p->lastinput != fmt) {
+                       vpb_record_buf_finish(p->handle);
+                       vpb_record_buf_start(p->handle, fmt);
+                       if(option_verbose>1) 
+                               ast_verbose( VERBOSE_PREFIX_2 "Changed record format on %s (%d=>%d)\n",p->dev,p->lastinput,fmt);
+               }
+               p->lastinput = fmt;
+
+               /* Read only if up and not bridged, or a bridge for which we can read. */
+               if( (res = vpb_record_buf_sync(p->handle, readbuf, readlen) ) == VPB_OK ) {
+                       // Apply extra gain !
+                       if( p->rxswgain > MAX_VPB_GAIN )
+                               gain_vector(p->rxswgain - MAX_VPB_GAIN , (short*)readbuf, readlen/sizeof(short));
+
+                       fr->subclass = afmt;
+                       fr->data = readbuf;
+                       fr->datalen = readlen;
+
+                       // Using trylock here to prevent deadlock when channel is hungup
+                       // (ast_hangup() immediately gets lock)
+                       if (p->owner && (ast_mutex_trylock(&p->owner->lock)==0) ) {
+                               ast_queue_frame(p->owner, fr, 0);
+                               ast_mutex_unlock(&p->owner->lock);
+                               if (option_verbose > 4) {
+                                       short * data = (short*)readbuf;
+                                       ast_verbose("Read channel %s (codec=%d) %d %d\n", p->dev, fmt, data[0], data[1] );     
+                               }  
+                       }
+               } else {
+                       ast_log(LOG_WARNING,"Record failure on %s (%s)\n", p->dev, vpb_strerror(res));
+                       vpb_record_buf_finish(p->handle);
+                       vpb_record_buf_start(p->handle, fmt);
+               }
+       }
 
 
-     if (option_verbose > 1)
-        ast_verbose(VERBOSE_PREFIX_2 "Ending record mode on %s (%d/%s)\n", 
-                            p->dev, p->stopreads, p->owner? "yes" : "no");     
+       /* When stopreads seen, go away! */
+       vpb_record_buf_finish(p->handle);
+       ast_mutex_unlock(&p->record_lock);
 
 
-     return NULL;
+       if (option_verbose > 1)
+               ast_verbose(VERBOSE_PREFIX_2 "Ending record mode on %s (%d/%s)\n",
+                        p->dev, p->stopreads, p->owner? "yes" : "no");     
+       return NULL;
 }
 
 static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context)
 }
 
 static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context)
@@ -1550,57 +1537,73 @@ static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context)
                usecnt++;
                ast_mutex_unlock(&usecnt_lock);
                ast_update_use_count();
                usecnt++;
                ast_mutex_unlock(&usecnt_lock);
                ast_update_use_count();
-               if (state != AST_STATE_DOWN) 
-                    if (ast_pbx_start(tmp)) {
-                         ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
-                         ast_hangup(tmp);
-                    }
-       } else
+               if (state != AST_STATE_DOWN) {
+                       if (ast_pbx_start(tmp)) {
+                               ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
+                               ast_hangup(tmp);
+                       }
+               }
+       } else {
                ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
                ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
+       }
        return tmp;
 }
 
 static struct ast_channel *vpb_request(char *type, int format, void *data) 
 {
        return tmp;
 }
 
 static struct ast_channel *vpb_request(char *type, int format, void *data) 
 {
-     int oldformat;
-     struct vpb_pvt *p;
-     struct ast_channel *tmp = NULL;
-     char *name = strdup(data ? (char *)data : "");
-     char *s, *sepstr;
-     
-     oldformat = format;
-     format &= prefformat;
-     if (!format) {
-         ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%d'\n", oldformat);
-         return NULL;
-     }
-     
-     sepstr = name;
-     s = strsep(&sepstr, "/"); /* Handle / issues */
-     if (!s) 
-         s = "";
-     /* Search for an unowned channel */
-     ast_mutex_lock(&iflock); {
-         p = iflist;
-         while(p) {
-              if (strncmp(s, p->dev + 4, sizeof p->dev) == 0) 
-                   if (!p->owner) {
-                        tmp = vpb_new(p, AST_STATE_DOWN, p->context);
-                        break;
-                   }
-              p = p->next;
-         }
-     } ast_mutex_unlock(&iflock);
-
-
-     if (option_verbose > 1) 
-         ast_verbose(VERBOSE_PREFIX_2 " %s requested, got: [%s]\n",
-                     name, tmp ? tmp->name : "None");
-
-     free(name);
-     
-     restart_monitor();
-     return tmp;
+       int oldformat;
+       struct vpb_pvt *p;
+       struct ast_channel *tmp = NULL;
+       char *name = strdup(data ? (char *)data : "");
+       char *s, *sepstr;
+       int group=-1;
+
+       oldformat = format;
+       format &= prefformat;
+       if (!format) {
+               ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%d'\n", oldformat);
+               return NULL;
+       }
+
+       sepstr = name;
+       s = strsep(&sepstr, "/"); /* Handle / issues */
+       if (!s) 
+               s = "";
+       /* Check if we are looking for a group */
+       if (toupper(name[0]) == 'G' || toupper(name[0])=='R') {
+               group=atoi(name+1);     
+       }
+       /* Search for an unowned channel */
+       ast_mutex_lock(&iflock); {
+               p = iflist;
+               while(p) {
+                       if (group == -1){
+                               if (strncmp(s, p->dev + 4, sizeof p->dev) == 0) {
+                                       if (!p->owner) {
+                                               tmp = vpb_new(p, AST_STATE_DOWN, p->context);
+                                               break;
+                                       }
+                               }
+                       }
+                       else {
+                               if ((p->group == group) && (!p->owner)) {
+                                       tmp = vpb_new(p, AST_STATE_DOWN, p->context);
+                                       break;
+                               }
+                       }
+                       p = p->next;
+               }
+       } ast_mutex_unlock(&iflock);
+
+
+       if (option_verbose > 1) 
+               ast_verbose(VERBOSE_PREFIX_2 " %s requested, got: [%s]\n",
+               name, tmp ? tmp->name : "None");
+
+       free(name);
+
+       restart_monitor();
+       return tmp;
 }
 
 static float parse_gain_value(char *gain_type, char *value)
 }
 
 static float parse_gain_value(char *gain_type, char *value)
@@ -1610,8 +1613,7 @@ static float parse_gain_value(char *gain_type, char *value)
        /* try to scan number */
        if (sscanf(value, "%f", &gain) != 1)
        {
        /* try to scan number */
        if (sscanf(value, "%f", &gain) != 1)
        {
-               ast_log(LOG_ERROR, "Invalid %s value '%s' in '%s' config\n",
-                       value, gain_type, config);
+               ast_log(LOG_ERROR, "Invalid %s value '%s' in '%s' config\n", value, gain_type, config);
                return DEFAULT_GAIN;
        }
 
                return DEFAULT_GAIN;
        }
 
@@ -1630,8 +1632,8 @@ int load_module()
        struct vpb_pvt *tmp;
        int board = 0, group = 0;
        int mode = MODE_IMMEDIATE;
        struct vpb_pvt *tmp;
        int board = 0, group = 0;
        int mode = MODE_IMMEDIATE;
-        float txgain = DEFAULT_GAIN, rxgain = DEFAULT_GAIN; 
-        float txswgain = 0, rxswgain = 0; 
+       float txgain = DEFAULT_GAIN, rxgain = DEFAULT_GAIN; 
+       float txswgain = 0, rxswgain = 0; 
        int first_channel = 1;
        int echo_cancel = DEFAULT_ECHO_CANCEL;
        int error = 0; /* Error flag */
        int first_channel = 1;
        int echo_cancel = DEFAULT_ECHO_CANCEL;
        int error = 0; /* Error flag */
@@ -1639,171 +1641,168 @@ int load_module()
        int bal2 = -1; 
        int bal3 = -1;
        char * callerid = NULL;
        int bal2 = -1; 
        int bal3 = -1;
        char * callerid = NULL;
-       
+
        cfg = ast_load(config);
        cfg = ast_load(config);
-       
+
        /* We *must* have a config file otherwise stop immediately */
        if (!cfg) {
        /* We *must* have a config file otherwise stop immediately */
        if (!cfg) {
-            ast_log(LOG_ERROR, "Unable to load config %s\n", config);
-            return -1;
+               ast_log(LOG_ERROR, "Unable to load config %s\n", config);
+               return -1;
        }  
        }  
-       
+
        vpb_seterrormode(VPB_ERROR_CODE);
 
        ast_mutex_lock(&iflock); {
        vpb_seterrormode(VPB_ERROR_CODE);
 
        ast_mutex_lock(&iflock); {
-            v = ast_variable_browse(cfg, "interfaces");
-            while(v) {
-                 /* Create the interface list */
-                 if (strcasecmp(v->name, "board") == 0) 
-                      board = atoi(v->value);
-                 else  if (strcasecmp(v->name, "group") == 0)
-                      group = atoi(v->value);
-                 else if (strcasecmp(v->name, "channel") == 0) {
-                      int channel = atoi(v->value);
-                      tmp = mkif(board, channel, mode, txgain, rxgain, txswgain, rxswgain, bal1, bal2, bal3, callerid, echo_cancel);
-                      if (tmp) {
-                           if(first_channel) {
-                               mkbrd( tmp->vpb_model, echo_cancel );
-                               first_channel = 0;
-                           }
-                           tmp->next = iflist;
-                           iflist = tmp;
-                      } else {
-                           ast_log(LOG_ERROR, 
-                                   "Unable to register channel '%s'\n", v->value);
-                           error = -1;
-                           goto done;
-                           
-                      }
-                      callerid = NULL;
-                 } else if (strcasecmp(v->name, "language") == 0) 
-                      strncpy(language, v->value, sizeof(language)-1);
-                 else if (strcasecmp(v->name, "callerid") == 0) {
-                     callerid = strdup(v->value);
-                 } else if (strcasecmp(v->name, "mode") == 0) {
-                      if (strncasecmp(v->value, "di", 2) == 0) 
-                           mode = MODE_DIALTONE;
-                      else if (strncasecmp(v->value, "im", 2) == 0)
-                           mode = MODE_IMMEDIATE;
-                      else if (strncasecmp(v->value, "fx", 2) == 0)
-                           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);
-                 else if (!strcasecmp(v->name, "echocancel")) {
-                      if (!strcasecmp(v->value, "off")) 
-                           echo_cancel = 0;
-                 } else if (strcasecmp(v->name, "txgain") == 0) {
-                      txswgain = parse_gain_value(v->name, v->value);
-                 } else if (strcasecmp(v->name, "rxgain") == 0) {
-                      rxswgain = parse_gain_value(v->name, v->value);
-                 } else if (strcasecmp(v->name, "txhwgain") == 0) {
-                      txgain = parse_gain_value(v->name, v->value);
-                 } else if (strcasecmp(v->name, "rxhwgain") == 0) {
-                      rxgain = parse_gain_value(v->name, v->value);
-                 } else if (strcasecmp(v->name, "bal1") == 0) {
-                      bal1 = strtol(v->value, NULL, 16);
-                      if(bal1<0 || bal1>255) {
-                           ast_log(LOG_WARNING, "Bad bal1 value: %d\n", bal1);
-                           bal1 = -1;
-                      }
-                 } else if (strcasecmp(v->name, "bal2") == 0) {
-                      bal2 = strtol(v->value, NULL, 16);
-                      if(bal2<0 || bal2>255) {
-                           ast_log(LOG_WARNING, "Bad bal2 value: %d\n", bal2);
-                           bal2 = -1;
-                      }
-                 } else if (strcasecmp(v->name, "bal3") == 0) {
-                      bal3 = strtol(v->value, NULL, 16);
-                      if(bal3<0 || bal3>255) {
-                           ast_log(LOG_WARNING, "Bad bal3 value: %d\n", bal3);
-                           bal3 = -1;
-                      }
-                 } else if (strcasecmp(v->name, "grunttimeout") == 0) 
-                      gruntdetect_timeout = 1000*atoi(v->value);
-                 v = v->next;
-            }
-            
-            if (gruntdetect_timeout < 1000)
-                 gruntdetect_timeout = 1000;
-
-       done: (void)0;
+               v = ast_variable_browse(cfg, "interfaces");
+               while(v) {
+                       /* Create the interface list */
+                       if (strcasecmp(v->name, "board") == 0) 
+                               board = atoi(v->value);
+                       else  if (strcasecmp(v->name, "group") == 0)
+                               group = atoi(v->value);
+                       else if (strcasecmp(v->name, "channel") == 0) {
+                               int channel = atoi(v->value);
+                               tmp = mkif(board, channel, mode, txgain, rxgain, txswgain, rxswgain, bal1, bal2, bal3, callerid, echo_cancel,group);
+                               if (tmp) {
+                                       if(first_channel) {
+                                               mkbrd( tmp->vpb_model, echo_cancel );
+                                               first_channel = 0;
+                                       }
+                                       tmp->next = iflist;
+                                       iflist = tmp;
+                               } else {
+                                       ast_log(LOG_ERROR, 
+                                       "Unable to register channel '%s'\n", v->value);
+                                       error = -1;
+                                       goto done;
+                               }
+                               callerid = NULL;
+                       } else if (strcasecmp(v->name, "language") == 0) {
+                               strncpy(language, v->value, sizeof(language)-1);
+                       } else if (strcasecmp(v->name, "callerid") == 0) {
+                               callerid = strdup(v->value);
+                       } else if (strcasecmp(v->name, "mode") == 0) {
+                               if (strncasecmp(v->value, "di", 2) == 0) 
+                                       mode = MODE_DIALTONE;
+                               else if (strncasecmp(v->value, "im", 2) == 0)
+                                       mode = MODE_IMMEDIATE;
+                               else if (strncasecmp(v->value, "fx", 2) == 0)
+                                       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);
+                       } else if (!strcasecmp(v->name, "echocancel")) {
+                               if (!strcasecmp(v->value, "off")) 
+                                       echo_cancel = 0;
+                       } else if (strcasecmp(v->name, "txgain") == 0) {
+                               txswgain = parse_gain_value(v->name, v->value);
+                       } else if (strcasecmp(v->name, "rxgain") == 0) {
+                               rxswgain = parse_gain_value(v->name, v->value);
+                       } else if (strcasecmp(v->name, "txhwgain") == 0) {
+                               txgain = parse_gain_value(v->name, v->value);
+                       } else if (strcasecmp(v->name, "rxhwgain") == 0) {
+                               rxgain = parse_gain_value(v->name, v->value);
+                       } else if (strcasecmp(v->name, "bal1") == 0) {
+                               bal1 = strtol(v->value, NULL, 16);
+                               if(bal1<0 || bal1>255) {
+                                       ast_log(LOG_WARNING, "Bad bal1 value: %d\n", bal1);
+                                       bal1 = -1;
+                               }
+                       } else if (strcasecmp(v->name, "bal2") == 0) {
+                               bal2 = strtol(v->value, NULL, 16);
+                               if(bal2<0 || bal2>255) {
+                                       ast_log(LOG_WARNING, "Bad bal2 value: %d\n", bal2);
+                                       bal2 = -1;
+                               }
+                       } else if (strcasecmp(v->name, "bal3") == 0) {
+                               bal3 = strtol(v->value, NULL, 16);
+                               if(bal3<0 || bal3>255) {
+                                       ast_log(LOG_WARNING, "Bad bal3 value: %d\n", bal3);
+                                       bal3 = -1;
+                               }
+                       } else if (strcasecmp(v->name, "grunttimeout") == 0) {
+                               gruntdetect_timeout = 1000*atoi(v->value);
+                       }
+                       v = v->next;
+               }
+
+               if (gruntdetect_timeout < 1000)
+                       gruntdetect_timeout = 1000;
+
+               done: (void)0;
        } ast_mutex_unlock(&iflock);
 
        ast_destroy(cfg);
        } ast_mutex_unlock(&iflock);
 
        ast_destroy(cfg);
-       
-       if (!error && 
-           ast_channel_register(type, tdesc, 
-                               prefformat, vpb_request) != 0) {
-            ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
-            
-            error = -1;
+
+       if (!error && ast_channel_register(type, tdesc, prefformat, vpb_request) != 0) {
+               ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
+               error = -1;
        }
 
 
        if (error)
        }
 
 
        if (error)
-            unload_module();
+               unload_module();
        else 
        else 
-            restart_monitor(); /* And start the monitor for the first time */
-       
+               restart_monitor(); /* And start the monitor for the first time */
+
        return error;
 }
 
 
 int unload_module()
 {
        return error;
 }
 
 
 int unload_module()
 {
-     struct vpb_pvt *p;
+       struct vpb_pvt *p;
        /* First, take us out of the channel loop */
        ast_channel_unregister(type);
 
        ast_mutex_lock(&iflock); {
        /* First, take us out of the channel loop */
        ast_channel_unregister(type);
 
        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;
+               /* 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);
 
        ast_mutex_lock(&monlock); {
        } ast_mutex_unlock(&iflock);
 
        ast_mutex_lock(&monlock); {
-            if (mthreadactive > -1) {
-                 pthread_cancel(monitor_thread);
-                 pthread_join(monitor_thread, NULL);
-            }
-            mthreadactive = -2;
+               if (mthreadactive > -1) {
+                       pthread_cancel(monitor_thread);
+                       pthread_join(monitor_thread, NULL);
+               }
+               mthreadactive = -2;
        } ast_mutex_unlock(&monlock);
 
        ast_mutex_lock(&iflock); {
                /* Destroy all the interfaces and free their memory */
 
                while(iflist) {
        } ast_mutex_unlock(&monlock);
 
        ast_mutex_lock(&iflock); {
                /* Destroy all the interfaces and free their memory */
 
                while(iflist) {
-                    p = iflist;                    
-                    ast_mutex_destroy(&p->lock);
-                    pthread_cancel(p->readthread);
-                    ast_mutex_destroy(&p->record_lock);
-                    ast_mutex_destroy(&p->play_lock);
-                    ast_mutex_destroy(&p->play_dtmf_lock);
-                    ast_mutex_destroy(&p->owner_lock);
-                    p->readthread = 0;
-                    
-                    vpb_close(p->handle);
-                    
-                    iflist = iflist->next;
-                    
-                    free(p);
+                       p = iflist;                 
+                       ast_mutex_destroy(&p->lock);
+                       pthread_cancel(p->readthread);
+                       ast_mutex_destroy(&p->record_lock);
+                       ast_mutex_destroy(&p->play_lock);
+                       ast_mutex_destroy(&p->play_dtmf_lock);
+                       ast_mutex_destroy(&p->owner_lock);
+                       p->readthread = 0;
+
+                       vpb_close(p->handle);
+
+                       iflist = iflist->next;
+
+                       free(p);
                }
                iflist = NULL;
        } ast_mutex_unlock(&iflock);
                }
                iflist = NULL;
        } ast_mutex_unlock(&iflock);
-       
+
        ast_mutex_lock(&bridge_lock); {
        ast_mutex_lock(&bridge_lock); {
-            memset(bridges, 0, sizeof bridges);             
+               memset(bridges, 0, sizeof bridges);          
        } ast_mutex_unlock(&bridge_lock);
        ast_mutex_destroy(&bridge_lock);
        free(bridges);
        } ast_mutex_unlock(&bridge_lock);
        ast_mutex_destroy(&bridge_lock);
        free(bridges);
-       
+
        return 0;
 }
 
        return 0;
 }