/ commit of a great deal of changes

/ tested these features using an OpenSwitch12
/   FXO=>FXS
/   FXS=>FXS
/   FXS=>FXO
/   FXO=>SIP
/   Echo cancelation.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2588 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 973 insertions, 448 deletions

diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index 085320ead..622b462b7 100755
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -33,22 +33,23 @@
 
 #include <vpbapi.h>
 
-
-#define DEFAULT_GAIN 1.0
+#define DEFAULT_GAIN 0
+#define DEFAULT_ECHO_CANCEL 1
+  
 #define VPB_SAMPLES 240 
 #define VPB_MAX_BUF VPB_SAMPLES*4 + AST_FRIENDLY_OFFSET
 
 #define VPB_NULL_EVENT 200
 
-#define VPB_DIALTONE_WAIT 2000
-#define VPB_RINGWAIT 2000
 #define VPB_WAIT_TIMEOUT 40
 
+#define MAX_VPB_GAIN 12.0
+
 #if defined(__cplusplus) || defined(c_plusplus)
  extern "C" {
 #endif
 
-static char *desc = "VoiceTronix V6PCI/V12PCI  API Support";
+static char *desc = "VoiceTronix V6PCI/V12PCI/V4PCI  API Support";
 static char *type = "vpb";
 static char *tdesc = "Standard VoiceTronix API Driver";
 static char *config = "vpb.conf";
@@ -60,16 +61,9 @@ static char context[AST_MAX_EXTENSION] = "default";
 static char language[MAX_LANGUAGE] = "";
 static int usecnt =0;
 
-static int echocancel = 1; 
-static int setrxgain = 0, settxgain = 0;
-
-static int tcounter  = 0;
+static int gruntdetect_timeout = 3600000; /* Grunt detect timeout is 1hr. */
 
-static int gruntdetect_timeout = 5000; /* Grunt detect timeout is 5 seconds. */
-
-static int silencesupression = 0;
-
-static const int prefformat = AST_FORMAT_ALAW | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW | AST_FORMAT_ADPCM;
+static const int prefformat = AST_FORMAT_SLINEAR;
 
 static ast_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
 
@@ -89,88 +83,180 @@ static int mthreadactive = -1; /* Flag for monitoring monitorthread.*/
 
 static int restart_monitor(void);
 
-/* The private structures of the VPB channels are linked for
-   selecting outgoing channels */
+/* The private structures of the VPB channels are 
+   linked for selecting outgoing channels */
    
 #define MODE_DIALTONE 	1
 #define MODE_IMMEDIATE	2
 #define MODE_FXO	3
 
+/* Pick a country or add your own! */
+#define TONES_AU
+//#define TONES_USA
+#ifdef TONES_AU
+static VPB_TONE Dialtone     = {440,   	440, 	440, 	-10,  	-10, 	-10, 	5000,	0   };
+static VPB_TONE Busytone     = {470,   	0,   	0, 	-10,  	-100, 	-100,   5000, 	0 };
+static VPB_TONE Ringbacktone = {400,   	50,   	440, 	-10,  	-10, 	-10,  	1400, 	800 };
+#endif
+#ifdef TONES_USA
+static VPB_TONE Dialtone     = {425,   0,   0, -16,  -100, -100, 10000,    0};
+static VPB_TONE Busytone     = {425,   0,   0, -10,  -100, -100,   500,  500};
+static VPB_TONE Ringbacktone = {400,   425,   450, -20,  -20, -20,  1000, 1000};
+#endif
 
-static VPB_TONE Dialtone     = {440, 440, 440, 0,  0, 0, 5000, 0   };
-static VPB_TONE Busytone     = {440,   0,   0, 0,  -100, -100,   500, 500};
-static VPB_TONE Ringbacktone = {440,   0,   0, 0,  -100, -100,  100, 100};
-
+/* grunt tone defn's */
+static VPB_DETECT toned_grunt = { 3, VPB_GRUNT, 1, 2000, 3000, 0, 0, -40, 0, 0, 0, 40, { { VPB_DELAY, 1000, 0, 0 }, { VPB_RISING, 0, 40, 0 }, { 0, 100, 0, 0 } } };
+static VPB_DETECT toned_ungrunt = { 2, VPB_GRUNT, 1, 2000, 1, 0, 0, -40, 0, 0, 30, 40, { { 0, 0, 0, 0 } } };
 
-#define VPB_MAX_BRIDGES 128 
-static struct vpb_bridge_t {
+#define TIMER_PERIOD_RINGBACK 5200
+#define TIMER_PERIOD_BUSY 700
+	  
+#define VPB_EVENTS_ALL (VPB_MRING|VPB_MDIGIT|VPB_MDTMF|VPB_MTONEDETECT|VPB_MTIMEREXP|VPB_MPLAY_UNDERFLOW \
+			|VPB_MRECORD_OVERFLOW|VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \
+			|VPB_MRING_OFF|VPB_MDROP|VPB_MSTATION_FLASH)
+#define VPB_EVENTS_NODTMF (VPB_MRING|VPB_MDIGIT|VPB_MTONEDETECT|VPB_MTIMEREXP|VPB_MPLAY_UNDERFLOW \
+			|VPB_MRECORD_OVERFLOW|VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \
+			|VPB_MRING_OFF|VPB_MDROP|VPB_MSTATION_FLASH)
+#define VPB_EVENTS_STAT (VPB_MRING|VPB_MDIGIT|VPB_MDTMF|VPB_MTONEDETECT|VPB_MTIMEREXP|VPB_MPLAY_UNDERFLOW \
+			|VPB_MRECORD_OVERFLOW|VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \
+			|VPB_MRING_OFF|VPB_MSTATION_FLASH)
+
+
+// Dialing parameters for Australia
+//#define DIAL_WITH_CALL_PROGRESS
+VPB_TONE_MAP DialToneMap[] = { 	{ VPB_BUSY_AUST, VPB_CALL_DISCONNECT, 0 },
+  				{ VPB_DIAL, VPB_CALL_DIALTONE, 0 },
+				{ VPB_RINGBACK_308, VPB_CALL_RINGBACK, 0 },
+				{ VPB_BUSY_AUST, VPB_CALL_BUSY, 0 },
+				{ VPB_GRUNT, VPB_CALL_GRUNT, 0 },
+				{ 0, 0, 1 } };
+#define VPB_DIALTONE_WAIT 2000 /* Wait up to 2s for a dialtone */
+#define VPB_RINGWAIT 4000 /* Wait up to 4s for ring tone after dialing */
+#define VPB_CONNECTED_WAIT 4000 /* If no ring tone detected for 4s then consider call connected */
+#define TIMER_PERIOD_NOANSWER 120000 /* Let it ring for 120s before deciding theres noone there */
+
+#define MAX_BRIDGES_V4PCI 2
+#define MAX_BRIDGES_V12PCI 128
+
+/* port states */
+#define VPB_STATE_ONHOOK	0
+#define VPB_STATE_OFFHOOK	1
+#define VPB_STATE_DIALLING	2
+#define VPB_STATE_JOINED	3
+#define VPB_STATE_GETDTMF	4
+#define VPB_STATE_PLAYDIAL	5
+#define VPB_STATE_PLAYBUSY	6
+#define VPB_STATE_PLAYRING	7
+
+
+typedef struct  {
      int inuse;
      struct ast_channel *c0, *c1, **rc;
      struct ast_frame **fo;
      int flags;
-     
      ast_mutex_t lock;
      pthread_cond_t cond;
-} bridges[VPB_MAX_BRIDGES]; /* Bridges...*/
+     int endbridge;
+} vpb_bridge_t;
+static vpb_bridge_t * bridges;
+static int max_bridges = MAX_BRIDGES_V4PCI;
 
 static ast_mutex_t bridge_lock = AST_MUTEX_INITIALIZER;
 
+typedef enum {
+     vpb_model_unknown = 0, 
+     vpb_model_v4pci,
+     vpb_model_v12pci
+} 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;						/* Is this in the  */
-     int handle;  /* Handle for vpb interface */
+     
+     int mode;				/* fxo/imediate/dialtone*/
+     int handle;			/* Handle for vpb interface */
 
-     char dev[256];
+     int state;				/* used to keep port state (internal to driver) */
 
+     char dev[256];
+     vpb_model_t vpb_model;
+     
      struct ast_frame f, fr;
-     char buf[VPB_MAX_BUF];			/* Static buffer for reading frames */
-     char obuf[VPB_MAX_BUF];
+     char buf[VPB_MAX_BUF];		/* Static buffer for reading frames */
      
      int dialtone;
-     float txgain, rxgain;             /* gain control for playing, recording  */
+     float txgain, rxgain;		/* Hardware gain control */
+     float txswgain, rxswgain;		/* Software gain control */
      
-     int wantdtmf; /* Waiting for DTMF. */
-     int silencesupression;
+     int wantdtmf;			/* Waiting for DTMF. */
      char context[AST_MAX_EXTENSION];
 
      char ext[AST_MAX_EXTENSION];
      char language[MAX_LANGUAGE];
-     char callerid[AST_MAX_EXTENSION];
+     char callerid[AST_MAX_EXTENSION];	/* CallerId used for directly connected phone */
 
-     int lastinput;
      int lastoutput;
+     int lastinput;
+     int last_ignore_dtmf;
+     
+     void *busy_timer;
+     int busy_timer_id;
 
-     struct vpb_bridge_t *bridge;
-     void *timer; /* For call timeout. */
-     int calling;
-    
-     int lastgrunt;
+     void *ringback_timer; 
+     int ringback_timer_id;
+     
+     double lastgrunt;
 
-     ast_mutex_t lock;
+     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. */
 
-    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 */
 
-     struct vpb_pvt *next;			/* Next channel in list */
 } *iflist = NULL;
 
-static char callerid[AST_MAX_EXTENSION];
+static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context);
+static void *do_chanreads(void *pvt);
+
+// Can't get vpb_bridge() working on v4pci without either a horrible
+// high pitched feedback noise or bad hiss noise depending on gain settings
+// Get asterisk to do the bridging
+#define BAD_V4PCI_BRIDGE
+
+// This one enables a half duplex bridge which may be required to prevent high pitched
+// feedback when getting asterisk to do the bridging and when using certain gain settings.
+//#define HALF_DUPLEX_BRIDGE
 
 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, len = sizeof bridges/sizeof bridges[0], res;
+     int i, res;
      
+#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 < len; i++) 
+	  for (i = 0; i < max_bridges; i++) 
 	       if (!bridges[i].inuse)
 		    break;
-	  if (i < len) {
+	  if (i < max_bridges) {
 	       bridges[i].inuse = 1;
+	       bridges[i].endbridge = 0;
 	       bridges[i].flags = flags;
 	       bridges[i].rc = rc;
 	       bridges[i].fo = fo;
@@ -181,7 +267,7 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
 	  } 	       
      } ast_mutex_unlock(&bridge_lock); 
 
-     if (i == len) {
+     if (i == max_bridges) {
 	  ast_log(LOG_WARNING, "Failed to bridge %s and %s!\n", c0->name, c1->name);
 	  return -2;
      } else {
@@ -195,22 +281,59 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
 	       p1->bridge = &bridges[i];
 	  } ast_mutex_unlock(&p1->lock);
 
-	  if (option_verbose > 4) 
-	       ast_verbose(VERBOSE_PREFIX_3 
-			   " Bridging call entered with [%s, %s]\n", c0->name, c1->name);
+	  if (option_verbose>1) 
+	       ast_verbose(VERBOSE_PREFIX_2 "Bridging call entered with [%s, %s]\n", c0->name, c1->name);
      }
-     res = vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_ON, 0);
-
-     if (res != VPB_OK) 
-	  goto done;
 
-     res = pthread_cond_wait(&bridges[i].cond, &bridges[i].lock); /* Wait for condition signal. */
-     
+#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;
+	} 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
      
- done: /* Out of wait. */
-
-     vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_OFF, 0); 
+     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;
@@ -227,14 +350,102 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
      } ast_mutex_unlock(&p1->lock);
 
      
-     if (option_verbose > 4) 
-	  ast_verbose(VERBOSE_PREFIX_3 
-		      " Bridging call done with [%s, %s] => %d\n", c0->name, c1->name, res);
+     if (option_verbose>1) 
+	  ast_verbose(VERBOSE_PREFIX_2 "Bridging call done with [%s, %s] => %d\n", c0->name, c1->name, res);
     
-     if (res != 0 && res != VPB_OK) /* Don't assume VPB_OK is zero! */
-	  return -1;
-     else 
-	  return 0;
+     return (res==VPB_OK)?0:-1;
+}
+
+static double get_time_in_ms()
+{
+    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
+// Australian (Telstra) callerid starts 700ms after 1st ring and finishes 1.5s after first ring
+// Use ANALYSE_CID to record rings and determine location of callerid
+//#define ANALYSE_CID
+#define RING_SKIP 600
+#define CID_MSECS 1700
+
+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
+
+        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)
+{
+    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)
+{
+    stoptone(handle);
+    return vpb_playtone_async(handle, tone);
 }
 
 static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
@@ -242,24 +453,34 @@ 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 > 4) 
-	  ast_verbose(VERBOSE_PREFIX_3 " %s handle_owned got event: [%d=>%d]\n",
+     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
+	  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 (p->calling) { /* This means time to stop calling. */
-	       f.subclass = AST_CONTROL_BUSY;
-	       vpb_timer_close(p->timer);
-	  } else
+	  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) {
@@ -270,17 +491,32 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
 	  break;
 
      case VPB_TONEDETECT:
-	  if (e->data == VPB_BUSY || e->data == VPB_BUSY_308 || e->data == VPB_BUSY_AUST)
-	       f.subclass = AST_CONTROL_BUSY;
-	  else if (e->data == VPB_GRUNT) {
-	       p->lastgrunt = tcounter;
-	       f.frametype = -1;
+	  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:
-	  if (e->data == VPB_CALL_CONNECTED)
+#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)
@@ -290,12 +526,25 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
 	       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;
+	  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;
@@ -304,17 +553,31 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
 	  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 > 4) 
-	  ast_verbose(VERBOSE_PREFIX_3 " handle_owned: putting frame: [%d=>%d], bridge=%p\n",
+     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); {
@@ -350,6 +613,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
 			 *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); 	       		   
 	       }	  
@@ -358,54 +622,85 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
      
      if (endbridge) return 0;
      
-     if (f.frametype >= 0 && f.frametype != AST_FRAME_NULL) 
-	  ast_queue_frame(p->owner, &f, 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;
 }
 
-static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context);
-
 static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e)
 {
      char s[2] = {0};
 
-     if (option_verbose > 4) 
-	  ast_verbose(VERBOSE_PREFIX_3 " %s: In not owned, mode=%d, [%d=>%d]\n",
+     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);
+	  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 {
-	       vpb_playtone_async(p->handle, &Dialtone);
+	       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->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 */
-           while (vpb_playtone_state(p->handle) != 0){
-                 vpb_tone_terminate(p->handle);
-                 vpb_sleep(10);
-             }
-	  p->wantdtmf = 1;
+     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) {
-           while (vpb_playtone_state(p->handle) != 0){
-                 vpb_tone_terminate(p->handle);
-                 vpb_sleep(10);
-             }
-
-	       p->wantdtmf = 0;
+             stoptone(p->handle);
+	     p->wantdtmf = 0;
 	  }
+          p->state=VPB_STATE_GETDTMF;
 	  s[0] = e->data;
 	  strcat(p->ext, s);
 	  
@@ -419,7 +714,9 @@ static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e)
 			 ast_log(LOG_DEBUG, 
 				 "%s can't match anything in %s or default\n", 
 				 p->ext, p->context);
-		    vpb_playtone_async(p->handle, &Busytone);
+		    playtone(p->handle, &Busytone);
+    		    vpb_timer_start(p->busy_timer);
+                    p->state = VPB_STATE_PLAYBUSY;
 	       }
 	  
 	  break;
@@ -429,8 +726,8 @@ static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e)
 	  break;
      }
      
-     if (option_verbose > 4) 
-	 ast_verbose(VERBOSE_PREFIX_3 " %s: Done not owned, mode=%d, [%d=>%d]\n",
+     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;
@@ -441,59 +738,84 @@ static void *do_monitor(void *unused)
     
      /* Monitor thread, doesn't die until explicitly killed. */
      
-     if (option_verbose > 4) 
-	  ast_verbose(VERBOSE_PREFIX_3 "Starting vpb monitor thread[%ld]\n",
+     if (option_verbose > 1) 
+	  ast_verbose(VERBOSE_PREFIX_2 "Starting vpb monitor thread[%ld]\n",
 		      pthread_self());
+
      pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
      
-     do {
+     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_OK)
-	       goto end_loop;
+	  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;
-	  ast_mutex_lock(&monlock),
-	       ast_mutex_lock(&iflock); {
-	       struct vpb_pvt *p = iflist; /* Find the pvt structure */	      
-		
-	       vpb_translate_event(&e, str);
+	  
+	  p = NULL;
+	  
+	  ast_mutex_lock(&monlock); {
+	       	
+	       	vpb_translate_event(&e, str);
 	       
-	       if (e.type == VPB_NULL_EVENT) 
+	       	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.*/
-	       while (p && p->handle != e.handle)
-		    p = p->next;
+	       	}
+		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 (option_verbose > 2)
-		    ast_verbose(VERBOSE_PREFIX_3 " Event [%d=>%s] on %s\n", 
+	  	if (p && (option_verbose > 3))
+		    ast_verbose(VERBOSE_PREFIX_4 "Event [%d=>%s] on %s\n", 
 				e.type, str, p ? p->dev : "null");
-	       
-	       if (!p) {
-			   ast_log(LOG_WARNING, 
-				   "Got event %s, no matching iface!\n", str);    
-			   goto done;
-	       } 
-	       
-	       
-	       /* Two scenarios: Are you owned or not. */
-	       
-	       if (p->owner) 
-			monitor_handle_owned(p, &e);
-	       else 
-		    monitor_handle_notowned(p, &e);
-	       
+
 	       done: (void)0;
-	  } ast_mutex_unlock(&iflock);
-	  ast_mutex_unlock(&monlock);
-	  
-     end_loop:
-	  tcounter += VPB_WAIT_TIMEOUT; /* Ok, not quite but will suffice. */
+
+	  } 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);
+	  }
 	  
-     } while(1);
-     
+     }
      
      return NULL;
 }
@@ -505,10 +827,16 @@ static int restart_monitor(void)
      /* 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) {
@@ -518,130 +846,188 @@ static int restart_monitor(void)
 	       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!*/
-
-#if 0	       
-	       if (option_verbose > 4) 
-		    ast_verbose(VERBOSE_PREFIX_3 
-				"Starting vpb restast: thread[%d]\n",
-				pid);
-#endif
 	  }
      done: (void)0;
      } ast_mutex_unlock(&monlock);
      
+     if (option_verbose > 3)
+	ast_verbose(VERBOSE_PREFIX_4 "Monitor restarted\n");
+     
      return error;
 }
 
-struct vpb_pvt *mkif(int board, int channel, int mode, float txgain, float rxgain)
+// Per board config that must be called after vpb_open()
+static void mkbrd(vpb_model_t model, int echo_cancel)
 {
-     struct vpb_pvt *tmp;
+     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*/
+	}
+     } 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*/
+	}
+     }
+}
 
+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 )
+{
+	struct vpb_pvt *tmp;
+	char buf[64];
 
-     tmp = (struct vpb_pvt *)calloc(1, sizeof *tmp);
+	tmp = (struct vpb_pvt *)calloc(1, sizeof *tmp);
 
-     if (!tmp)
-	  return NULL;
+	if (!tmp)
+		return NULL;
 
-     tmp->handle = vpb_open(board, channel);
-     
-     if (tmp->handle < 0) {	  
-	  ast_log(LOG_WARNING, "Unable to create channel vpb/%d-%d: %s\n",
-		  board, channel, strerror(errno));
-	  free(tmp);
-	  return NULL;
-     }
-          
-     if (echocancel) {
-	  if (option_verbose > 4)
-	       ast_verbose(VERBOSE_PREFIX_3 " vpb turned on echo cancel.\n");
-	  vpb_echo_canc_enable();
-	  vpb_echo_canc_force_adapt_on();
-	  echocancel = 0; /* So we do not initialise twice! */
-     }
-     
-     if (option_verbose > 4) 
-	  ast_verbose(VERBOSE_PREFIX_3 " vpb created channel: [%d:%d]\n",
-		      board, channel);
+	tmp->handle = vpb_open(board, channel);
 
-     sprintf(tmp->dev, "vpb/%d-%d", board, channel);
+	if (tmp->handle < 0) {	  
+		ast_log(LOG_WARNING, "Unable to create channel vpb/%d-%d: %s\n", 
+					board, channel, strerror(errno));
+		free(tmp);
+		return NULL;
+	}
+	       
+	sprintf(tmp->dev, "vpb/%d-%d", board, channel);
 
-     tmp->mode = mode;
+	tmp->mode = mode;
 
-     strcpy(tmp->language, language);
-     strcpy(tmp->context, context);
-     
-     strcpy(tmp->callerid, callerid);
-     tmp->txgain = txgain;
+	strcpy(tmp->language, language);
+	strcpy(tmp->context, context);
 
-     tmp->rxgain = rxgain;
+	if(callerid) { 
+		strcpy(tmp->callerid, callerid);
+		free(callerid);
+	} else {
+		strcpy(tmp->callerid, "unknown");
+	}
 
-     tmp->lastinput = -1;
-     tmp->lastoutput = -1;
+	/* check if codec balances have been set in the config file */
+	if (bal3>=0) {
+		if ((bal1>=0) && !(bal1 & 32)) bal1 |= 32;
+			vpb_set_codec_reg(tmp->handle, 0x42, bal3);
+	}
+	if(bal1>=0) vpb_set_codec_reg(tmp->handle, 0x32, bal1);
+	if(bal2>=0) vpb_set_codec_reg(tmp->handle, 0x3a, bal2);
 
-     tmp->bridge = NULL;
+	tmp->txgain = txgain;
+	vpb_play_set_hw_gain(tmp->handle, (txgain > MAX_VPB_GAIN) ? MAX_VPB_GAIN : txgain);
 
-     tmp->readthread = 0;
+	tmp->rxgain = rxgain;
+	vpb_record_set_hw_gain(tmp->handle, (rxgain > MAX_VPB_GAIN) ? MAX_VPB_GAIN : rxgain);
 
-     ast_mutex_init(&tmp->lock);
+	tmp->txswgain = txswgain;
+	vpb_play_set_gain(tmp->handle, (txswgain > MAX_VPB_GAIN) ? MAX_VPB_GAIN : txswgain);
 
-     if (setrxgain)      
-	  vpb_record_set_gain(tmp->handle, rxgain);
-     if (settxgain)  
-	  vpb_play_set_gain(tmp->handle, txgain);
-     
-     return tmp;
-}
+	tmp->rxswgain = rxswgain;
+	vpb_record_set_gain(tmp->handle, (rxswgain > MAX_VPB_GAIN) ? MAX_VPB_GAIN : rxswgain);
 
+	tmp->vpb_model = vpb_model_unknown;
+	if( vpb_get_model(buf) == VPB_OK ) {
+		if(strcmp(buf,"V12PCI")==0) 
+			tmp->vpb_model = vpb_model_v12pci;
+		else if(strcmp(buf,"VPB4")==0) 
+			tmp->vpb_model = vpb_model_v4pci;
+	}
+
+	ast_mutex_init(&tmp->lock);
+	ast_mutex_init(&tmp->record_lock);
+	ast_mutex_init(&tmp->play_lock);
+	ast_mutex_init(&tmp->play_dtmf_lock);
+	ast_mutex_init(&tmp->owner_lock);
+
+	tmp->busy_timer_id = vpb_timer_get_unique_timer_id();
+	vpb_timer_open(&tmp->busy_timer, tmp->handle, tmp->busy_timer_id, TIMER_PERIOD_BUSY);
+
+	tmp->ringback_timer_id = vpb_timer_get_unique_timer_id();
+	vpb_timer_open(&tmp->ringback_timer, tmp->handle, tmp->ringback_timer_id, TIMER_PERIOD_RINGBACK);
+	      
+	if (mode == MODE_FXO){
+		vpb_set_event_mask(tmp->handle, VPB_EVENTS_NODTMF );
+	}
+	else {
+		vpb_set_event_mask(tmp->handle, VPB_EVENTS_STAT );
+	}
+
+	if ((tmp->vpb_model == vpb_model_v12pci) && (echo_cancel)){
+		vpb_hostecho_on(tmp->handle);
+	}
+
+	/* define grunt tone */
+	vpb_settonedet(tmp->handle,&toned_ungrunt);
+
+	ast_log(LOG_NOTICE,"Voicetronix %s channel %s initialized (rxgain=%f txgain=%f) (%f/%f/0x%X/0x%X/0x%X)\n",
+		(tmp->vpb_model==vpb_model_v4pci)?"V4PCI":
+		(tmp->vpb_model==vpb_model_v12pci)?"V12PCI":"[Unknown model]",
+		tmp->dev, tmp->rxswgain, tmp->txswgain, tmp->rxgain, tmp->txgain, bal1, bal2, bal3 );
+
+	return tmp;
+}
 
 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 > 4)
-	ast_verbose(VERBOSE_PREFIX_3 " vpb indicate on %s with %d\n",
+    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:
-          while (vpb_playtone_state(p->handle) != 0){
-                res = vpb_tone_terminate(p->handle);
-                vpb_sleep(10);
-            }
-	    res = vpb_playtone_async(p->handle, &Busytone);
+	    playtone(p->handle, &Busytone);
+            p->state = VPB_STATE_PLAYBUSY;
+ 	    vpb_timer_start(p->busy_timer); 
 	    break;
 	case AST_CONTROL_RINGING:
-          while (vpb_playtone_state(p->handle) != 0){
-                res = vpb_tone_terminate(p->handle);
-                vpb_sleep(10);
-            }
-	    res = vpb_playtone_async(p->handle, &Ringbacktone);
+	    playtone(p->handle, &Ringbacktone);
+ 	    vpb_timer_start(p->ringback_timer);
 	    break;	    
 	case AST_CONTROL_ANSWER:
 	case -1: /* -1 means stop playing? */
-           while (vpb_playtone_state(p->handle) != 0){
-                 res = vpb_tone_terminate(p->handle);
-                 vpb_sleep(10);
-	   }
-
-	    break;
+ 	   vpb_timer_stop(p->ringback_timer);
+ 	   vpb_timer_stop(p->busy_timer);
+           stoptone(p->handle);
+	   break;
 	case AST_CONTROL_HANGUP:
-          while (vpb_playtone_state(p->handle) != 0){
-                res = vpb_tone_terminate(p->handle);
-                vpb_sleep(10);
-            }
-	    res = vpb_playtone_async(p->handle, &Busytone);
+	    playtone(p->handle, &Busytone);
+            p->state = VPB_STATE_PLAYBUSY;
+ 	    vpb_timer_start(p->busy_timer);
 	    break;
 	    
 	default:
@@ -655,25 +1041,36 @@ static int vpb_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, i
 {
 	struct vpb_pvt *p = (struct vpb_pvt *)newchan->pvt->pvt;
 
+	if (needlock)
+		ast_mutex_lock(&p->lock);
 	ast_log(LOG_DEBUG, 
 		"New owner for channel %s is %s\n", p->dev, newchan->name);
-	if (p->owner == oldchan)
+
+	if (p->owner == oldchan) {
 		p->owner = newchan;
+	}
 
 	if (newchan->_state == AST_STATE_RINGING) 
 		vpb_indicate(newchan, AST_CONTROL_RINGING);
 
+	if (needlock)
+		ast_mutex_unlock(&p->lock);
 	return 0;
 }
 
 static int vpb_digit(struct ast_channel *ast, char digit)
 {
+    struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
     char s[2];
 
     s[0] = digit;
     s[1] = '\0';
-   
-    return vpb_dial_sync(((struct vpb_pvt *)ast->pvt->pvt)->handle, s);
+    
+    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;
 }
 
 
@@ -694,49 +1091,67 @@ static int vpb_call(struct ast_channel *ast, char *dest, int timeout)
 	return -1;
     }
     if (p->mode != MODE_FXO)  /* Station port, ring it. */
-	res = vpb_ring_station_async(p->handle, VPB_RING_STATION_ON,'1');       
+	res = vpb_ring_station_async(p->handle, VPB_RING_STATION_ON,0);       
      else {
 	  VPB_CALL call;
 
-	  vpb_get_call(p->handle, &call);
-	  
-	  call.dialtone_timeout = VPB_DIALTONE_WAIT;
-	  call.answer_timeout = timeout;
-	  call.ringback_timeout = VPB_RINGWAIT;
-
+	  // 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 > 2)
-	       ast_verbose(VERBOSE_PREFIX_3 " Calling %s on %s \n", 
-			   dest, ast->name); 
+	  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, dest, vpb_strerror(res));	      
+		    ast->name, s, vpb_strerror(res));	      
 	    res = -1;
 	  } else 
 	    res = 0;
     }
 
     if (option_verbose > 2)
-	ast_verbose(VERBOSE_PREFIX_3 
+	ast_verbose(VERBOSE_PREFIX_3
 		    " VPB Calling %s [t=%d] on %s returned %d\n", 
-		    dest, timeout, ast->name, res); 
+		    s, timeout, ast->name, res); 
 
     if (res == 0) {
-	 if (timeout) {
-	      vpb_timer_open(&p->timer, p->handle, 0, 100*timeout);
-	      vpb_timer_start(p->timer);
-	 }
-	 p->calling = 1;
-	ast_setstate(ast, AST_STATE_RINGING);
-	ast_queue_control(ast,AST_CONTROL_RINGING, 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;
 }
 
@@ -744,50 +1159,65 @@ static int vpb_hangup(struct ast_channel *ast)
 {
     struct vpb_pvt *p;
 
-    if (option_verbose > 2) 
-	ast_verbose(VERBOSE_PREFIX_3 " hangup on vpb (%s)\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);
 	return 0;
     }
 
+    ast_setstate(ast,AST_STATE_DOWN);
+
     p = (struct vpb_pvt *)ast->pvt->pvt;
 
-    vpb_play_terminate(p->handle);
-    vpb_record_terminate(p->handle);
+    /* 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,'1');	
-	vpb_playtone_async(p->handle, &Busytone);
+	vpb_ring_station_async(p->handle, VPB_RING_STATION_OFF,0);	
+	playtone(p->handle, &Busytone);
+        p->state = VPB_STATE_PLAYBUSY;
 
-    } else
+    } else {
+	stoptone(p->handle); // Terminates any dialing
 	vpb_sethook_sync(p->handle, VPB_ONHOOK);
-
-    ast_setstate(ast,AST_STATE_DOWN);
+    }
     
-    ast_mutex_lock(&p->lock); {    
-	 p->lastinput = p->lastoutput  = -1;
-	 p->ext[0]  = 0;
-	 p->owner = NULL;
-	 p->dialtone = 0;
-	 p->calling = 0;
-	 ast->pvt->pvt = NULL; 	 
-    } ast_mutex_unlock(&p->lock);
+    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();
 
-    /* Stop thread doing reads. */
-    p->stopreads = 1;
-    pthread_join(p->readthread, NULL); 
-
-    if (option_verbose > 2)
-	ast_verbose(VERBOSE_PREFIX_3 " Hungup on %s complete\n", ast->name);
+    if (option_verbose > 1)
+	ast_verbose(VERBOSE_PREFIX_2 "Hangup on %s complete\n", ast->name);
     
     restart_monitor();
+
     return 0;
 }
 
@@ -796,12 +1226,14 @@ static int vpb_answer(struct ast_channel *ast)
     struct vpb_pvt *p = (struct vpb_pvt *)ast->pvt->pvt;
 
     if (p->mode == MODE_FXO)
-	vpb_sethook_sync(p->handle, VPB_OFFHOOK);
-    
-    if (option_debug)
-	ast_log(LOG_DEBUG, "vpb answer on %s\n", ast->name);
+    	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);
+
     ast->rings = 0;
-    ast_setstate(ast, AST_STATE_UP);
+
+    pthread_create(&p->readthread, NULL, do_chanreads, (void *)p);
     
     return 0;
 }
@@ -851,50 +1283,69 @@ static inline int astformatbits(int ast_format)
     }   
 }
 
+int gain_vector(float g, short *v, int n) {
+        int 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;	
+	}  
+	return(i);
+}	  
+
 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;
 
     if (frame->frametype != AST_FRAME_VOICE) {
-	ast_log(LOG_WARNING, "Don't know how to handle from type %d\n",
-		frame->frametype);
+	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  > 4)
-	    ast_log(LOG_WARNING, "Writing frame type [%d,%d] on chan %s not up\n",
+	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;
-	
     }
-    
 
     fmt = ast2vpbformat(frame->subclass);
-
-    if (option_verbose > 4)
-	ast_verbose(VERBOSE_PREFIX_3 
-		    " Write chan %s: got frame type = %d\n",
-		    p->dev, frame->subclass);
-       
     if (fmt < 0) {
 	ast_log(LOG_WARNING, "vpb_write Cannot handle frames of %d format!\n", 
 		frame->subclass);
 	return -1;
     }
     
-
-    if (p->lastoutput != fmt) {
-	 vpb_play_buf_start(p->handle, fmt);
-	 p->lastoutput = fmt;
+    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]);
     }
     
-    memcpy(p->obuf, frame->data, 
-	   (frame->datalen > (int)sizeof p->obuf) ? sizeof p->obuf : frame->datalen);
-    res = vpb_play_buf_sync(p->handle, p->obuf, frame->datalen);
-    if (res != VPB_OK)
-	 return -1;
-    else 
-	 return 0;
+    ast_mutex_unlock(&p->play_lock);
+    
+    return 0;
 }
 
 /* Read monitor thread function. */
@@ -904,36 +1355,21 @@ static void *do_chanreads(void *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);
 
-     while (!p->stopreads && p->owner) {	 
-	 int res = -1, fmt;
-	 struct ast_channel *owner = p->owner;
-	 int afmt = (owner) ? owner->pvt->rawreadformat : AST_FORMAT_ALAW;
-	 int state = (owner) ? owner->_state : AST_STATE_DOWN;
-	 int readlen;	
-	 
-	 fmt = ast2vpbformat(afmt);
-	 
-	 if (fmt < 0) {
-	     p->stopreads = 1;
-	     goto done;
-	 }
-
-	 readlen = VPB_SAMPLES * astformatbits(afmt) / 8;
-
-	 if (p->lastinput != fmt) {
-	     if (option_verbose > 2) 
-		 ast_verbose(" Read_channel ##  %s: Setting record mode, bridge = %d\n", 
-			     p->dev, p->bridge ? 1 : 0);     	     
-	     vpb_record_buf_start(p->handle, fmt);
-	     p->lastinput = fmt;
-	 } 
+     p->stopreads = 0; 
+     while (!p->stopreads && p->owner) {
 
 	 ast_mutex_lock(&p->lock); {
 	      if (p->bridge) 
@@ -949,37 +1385,103 @@ static void *do_chanreads(void *pvt)
 		   bridgerec = 1;
 	 } ast_mutex_unlock(&p->lock);
 	 
-	 if (state == AST_STATE_UP && bridgerec) {  
-             /* Read only if up and not bridged, or a bridge for which we can read. */
-	      res = vpb_record_buf_sync(p->handle, readbuf, readlen);	      
-	}  else {
-	      res = 0;
+	 if ( (p->owner->_state != AST_STATE_UP) || !bridgerec) {
 	      vpb_sleep(10);
+	      continue;
 	 }
-	 if (res == VPB_OK) {
-	      fr->subclass = afmt;
-	      fr->samples = VPB_SAMPLES;
-	      fr->data = readbuf;
-	      fr->datalen = readlen;
-	      fr->offset = AST_FRIENDLY_OFFSET;
-
-	      ast_mutex_lock(&p->lock); {    
-		   if (p->owner) ast_queue_frame(p->owner, fr, 0);
-	      } ast_mutex_unlock(&p->lock);
-	 } else 
-	      p->stopreads = 1;
-	 	 
-     done: (void)0;
-	 if (option_verbose > 4)
-	     ast_verbose(" Read_channel  %s (state=%d), res=%d, bridge=%d\n", 
-			 p->dev, state, res, bridgerec);     
+	 
+	 // 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);
 
-     if (option_verbose > 4)
-	 ast_verbose(" Read_channel  %s terminating, stopreads=%d, owner=%s\n", 
+     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;
@@ -999,9 +1501,12 @@ static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context)
 		strncpy(tmp->name, i->dev, sizeof(tmp->name));
 		tmp->type = type;
 	       
+		// Linear is the preferred format. Although Voicetronix supports other formats
+		// they are all converted to/from linear in the vpb code. Best for us to use
+		// linear since we can then adjust volume in this modules.
 		tmp->nativeformats = prefformat;
-		tmp->pvt->rawreadformat = AST_FORMAT_ALAW;
-		tmp->pvt->rawwriteformat =  AST_FORMAT_ALAW;
+		tmp->pvt->rawreadformat = AST_FORMAT_SLINEAR;
+		tmp->pvt->rawwriteformat =  AST_FORMAT_SLINEAR;
 		ast_setstate(tmp, state);
 		if (state == AST_STATE_RING)
 			tmp->rings = 1;
@@ -1023,13 +1528,17 @@ static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context)
 			strncpy(tmp->exten, "s",  sizeof(tmp->exten) - 1);
 		if (strlen(i->language))
 			strncpy(tmp->language, i->language, sizeof(tmp->language)-1);
-		if (strlen(i->callerid))
-			tmp->callerid = strdup(i->callerid);
-		i->owner = tmp;
 
+		i->owner = tmp;
+     
+     		i->bridge = NULL;
+		i->lastoutput = -1;
+		i->lastinput = -1;
+		i->last_ignore_dtmf = 1;
+		i->readthread = 0;
+		i->play_dtmf[0] = '\0';
 		
-		i->lastinput = i->lastoutput = -1;
-		i->lastgrunt  = tcounter; /* Assume at least one grunt tone seen now. */
+		i->lastgrunt  = get_time_in_ms(); /* Assume at least one grunt tone seen now. */
 
 		ast_mutex_lock(&usecnt_lock);
 		usecnt++;
@@ -1040,10 +1549,6 @@ static struct ast_channel *vpb_new(struct vpb_pvt *i, int state, char *context)
 			  ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 			  ast_hangup(tmp);
 		     }
-
-		i->stopreads = 0; /* So read thread runs. */	
-		/* Finally start read monitoring thread. */
-		pthread_create(&i->readthread, NULL, do_chanreads, (void *)i);
 	} else
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 	return tmp;
@@ -1082,8 +1587,8 @@ static struct ast_channel *vpb_request(char *type, int format, void *data)
      } ast_mutex_unlock(&iflock);
 
 
-     if (option_verbose > 2) 
-	  ast_verbose(VERBOSE_PREFIX_3 " %s requested, got: [%s]\n",
+     if (option_verbose > 1) 
+	  ast_verbose(VERBOSE_PREFIX_2 " %s requested, got: [%s]\n",
 		      name, tmp ? tmp->name : "None");
 
      free(name);
@@ -1106,68 +1611,12 @@ static float parse_gain_value(char *gain_type, char *value)
 
 
 	/* percentage? */
-	if (value[strlen(value) - 1] == '%')
-		return gain / (float)100;
+	//if (value[strlen(value) - 1] == '%')
+	//	return gain / (float)100;
 
 	return gain;
 }
 
-static int __unload_module(void)
-{
-     struct vpb_pvt *p;
-	/* 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;
-	} ast_mutex_unlock(&iflock);
-
-	ast_mutex_lock(&monlock); {
-	     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) {
-		     p = iflist;		    
-		     ast_mutex_destroy(&p->lock);
-		     pthread_cancel(p->readthread);
-		     p->readthread = 0;
-		     
-		     iflist = iflist->next;
-		     
-		     free(p);
-		}
-		iflist = NULL;
-	} ast_mutex_unlock(&iflock);
-	
-	ast_mutex_lock(&bridge_lock); {
-	     memset(bridges, 0, sizeof bridges);	     
-	} ast_mutex_unlock(&bridge_lock);
-	ast_mutex_destroy(&bridge_lock);
-
-	tcounter = 0;
-	
-	return 0;
-}
-
-int unload_module(void)
-{
-	return __unload_module();
-}
-
 int load_module()
 {
 	struct ast_config *cfg;
@@ -1176,12 +1625,15 @@ int load_module()
 	int board = 0, group = 0;
 	int mode = MODE_IMMEDIATE;
         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 */
-
-
-	setrxgain = settxgain = 0;
-
+	int bal1 = -1; // Special value - means do not set
+	int bal2 = -1; 
+	int bal3 = -1;
+	char * callerid = NULL;
+	
 	cfg = ast_load(config);
 	
 	/* We *must* have a config file otherwise stop immediately */
@@ -1190,8 +1642,8 @@ int load_module()
 	     return -1;
 	}  
 	
-	vpb_seterrormode(VPB_DEVELOPMENT);
-	
+	vpb_seterrormode(VPB_ERROR_CODE);
+
 	ast_mutex_lock(&iflock); {
 	     v = ast_variable_browse(cfg, "interfaces");
 	     while(v) {
@@ -1202,11 +1654,14 @@ int load_module()
 		       group = atoi(v->value);
 		  else if (strcasecmp(v->name, "channel") == 0) {
 		       int channel = atoi(v->value);
-		       tmp = mkif(board, channel, mode, txgain, rxgain);
+		       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);
@@ -1214,13 +1669,12 @@ int load_module()
 			    goto done;
 			    
 		       }
-		  } else if (strcasecmp(v->name, "silencesupression") == 0) 
-		       silencesupression = ast_true(v->value);
-		  else if (strcasecmp(v->name, "language") == 0) 
+		       callerid = NULL;
+		  } else if (strcasecmp(v->name, "language") == 0) 
 		       strncpy(language, v->value, sizeof(language)-1);
-		  else if (strcasecmp(v->name, "callerid") == 0) 
-		       strncpy(callerid, v->value, sizeof(callerid)-1);
-		  else if (strcasecmp(v->name, "mode") == 0) {
+		  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)
@@ -1233,20 +1687,35 @@ int load_module()
 		       strncpy(context, v->value, sizeof(context)-1);
 		  else if (!strcasecmp(v->name, "echocancel")) {
 		       if (!strcasecmp(v->value, "off")) 
-			    echocancel = 0;
-		       else 
-			    echocancel = 1;
+		       	    echo_cancel = 0;
 		  } else if (strcasecmp(v->name, "txgain") == 0) {
-		       settxgain = 1;
-		       txgain = parse_gain_value(v->name, v->value);
+		       txswgain = parse_gain_value(v->name, v->value);
 		  } else if (strcasecmp(v->name, "rxgain") == 0) {
-		       setrxgain = 1;
+		       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);
-		  } 
-#if 0
-		  else if (strcasecmp(v->name, "grunttimeout") == 0) 
+		  } 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);
-#endif	  
 		  v = v->next;
 	     }
 	     
@@ -1256,7 +1725,6 @@ int load_module()
 	done: (void)0;
 	} ast_mutex_unlock(&iflock);
 
-	
 	ast_destroy(cfg);
 	
 	if (!error && 
@@ -1269,13 +1737,70 @@ int load_module()
 
 
 	if (error)
-	     __unload_module();
-	else	     
+	     unload_module();
+	else 
 	     restart_monitor(); /* And start the monitor for the first time */
 	
 	return error;
 }
 
+
+int unload_module()
+{
+     struct vpb_pvt *p;
+	/* 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;
+	} ast_mutex_unlock(&iflock);
+
+	ast_mutex_lock(&monlock); {
+	     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) {
+		     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);
+	
+	ast_mutex_lock(&bridge_lock); {
+	     memset(bridges, 0, sizeof bridges);	     
+	} ast_mutex_unlock(&bridge_lock);
+	ast_mutex_destroy(&bridge_lock);
+	free(bridges);
+	
+	return 0;
+}
+
 int usecount()
 {
 	int res;