[Asterisk-code-review] chan_vpb: Remove deprecated module. (asterisk[19])

George Joseph asteriskteam at digium.com
Wed Aug 18 11:13:58 CDT 2021


George Joseph has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/16322 )

Change subject: chan_vpb: Remove deprecated module.
......................................................................

chan_vpb: Remove deprecated module.

ASTERISK-29597

Change-Id: I19bb39eed0257ddfef453eb2df5646d073d50fe1
---
M build_tools/menuselect-deps.in
D channels/chan_vpb.cc
D configs/samples/vpb.conf.sample
M configure
M configure.ac
M contrib/scripts/install_prereq
A doc/UPGRADE-staging/chan_vpb_removal.txt
M include/asterisk/autoconfig.h.in
M include/asterisk/doxygen/licensing.h
M makeopts.in
M tests/CI/buildAsterisk.sh
11 files changed, 9 insertions(+), 3,344 deletions(-)

Approvals:
  Sean Bright: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Joshua Colp: Approved for Submit



diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index a595d64..89c9aa2 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -67,7 +67,6 @@
 UNBOUND=@PBX_UNBOUND@
 UNIXODBC=@PBX_UNIXODBC@
 VORBIS=@PBX_VORBIS@
-VPB=@PBX_VPB@
 WINARCH=@PBX_WINARCH@
 ZLIB=@PBX_ZLIB@
 TIMERFD=@PBX_TIMERFD@
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
deleted file mode 100644
index 9bcf305..0000000
--- a/channels/chan_vpb.cc
+++ /dev/null
@@ -1,2882 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2003, Paul Bagyenda
- * Paul Bagyenda <bagyenda at dsmagic.com>
- * Copyright (C) 2004 - 2005, Ben Kramer
- * Ben Kramer <ben at voicetronix.com.au>
- *
- * Daniel Bichara <daniel at bichara.com.br> - Brazilian CallerID detection (c)2004
- *
- * Welber Silveira - welberms at magiclink.com.br - (c)2004
- * Copying CLID string to propper structure after detection
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*! \file
- *
- * \brief VoiceTronix Interface driver
- *
- * \ingroup channel_drivers
- */
-
-/*! \li \ref chan_vpb.cc uses the configuration file \ref vpb.conf
- * \addtogroup configuration_file
- */
-
-/*! \page vpb.conf vpb.conf
- * \verbinclude vpb.conf.sample
- */
-
-/*
- * XXX chan_vpb needs its native bridge code converted to the
- * new bridge technology scheme.  The chan_dahdi native bridge
- * code can be used as an example.  It is unlikely that this
- * will ever get done.
- *
- * The existing native bridge code is marked with the
- * VPB_NATIVE_BRIDGING conditional.
- */
-
-/*** MODULEINFO
-	<depend>vpb</depend>
-	<defaultenabled>no</defaultenabled>
-	<support_level>deprecated</support_level>
-	<deprecated_in>16</deprecated_in>
-	<removed_in>19</removed_in>
- ***/
-
-#include <vpbapi.h>
-
-extern "C" {
-
-#include "asterisk.h"
-
-#include "asterisk/lock.h"
-#include "asterisk/utils.h"
-#include "asterisk/channel.h"
-#include "asterisk/config.h"
-#include "asterisk/module.h"
-#include "asterisk/pbx.h"
-#include "asterisk/callerid.h"
-#include "asterisk/dsp.h"
-#include "asterisk/features.h"
-#include "asterisk/musiconhold.h"
-#include "asterisk/format_cache.h"
-}
-
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <ctype.h>
-
-#include <assert.h>
-
-#ifdef pthread_create
-#undef pthread_create
-#endif
-
-#define DEFAULT_GAIN 0
-#define DEFAULT_ECHO_CANCEL 1
-
-#define VPB_SAMPLES 160
-#define VPB_MAX_BUF VPB_SAMPLES*4 + AST_FRIENDLY_OFFSET
-
-#define VPB_NULL_EVENT 200
-
-#define VPB_WAIT_TIMEOUT 4000
-
-#define MAX_VPB_GAIN 12.0
-#define MIN_VPB_GAIN -12.0
-
-#define DTMF_CALLERID
-#define DTMF_CID_START 'D'
-#define DTMF_CID_STOP 'C'
-
-/**/
-#if defined(__cplusplus) || defined(c_plusplus)
- extern "C" {
-#endif
-/**/
-
-static const char tdesc[] = "Standard VoiceTronix API Driver";
-static const char config[] = "vpb.conf";
-
-/* Default context for dialtone mode */
-static char context[AST_MAX_EXTENSION] = "default";
-
-/* Default language */
-static char language[MAX_LANGUAGE] = "";
-
-static int gruntdetect_timeout = 3600000; /* Grunt detect timeout is 1hr. */
-
-/* Protect the interface list (of vpb_pvt's) */
-AST_MUTEX_DEFINE_STATIC(iflock);
-
-/* Protect the monitoring thread, so only one process can kill or start it, and not
-   when it's doing something critical. */
-AST_MUTEX_DEFINE_STATIC(monlock);
-
-/* This is the thread for the monitor which checks for input on the channels
-   which are not currently in use.  */
-static pthread_t monitor_thread;
-
-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 */
-
-#define MODE_DIALTONE 	1
-#define MODE_IMMEDIATE	2
-#define MODE_FXO	3
-
-/* Pick a country or add your own! */
-/* These are the tones that are played to the user */
-#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     = {350, 440,   0, -16,   -16, -100, 10000,    0};
-static VPB_TONE Busytone     = {480, 620,   0, -10,   -10, -100,   500,  500};
-static VPB_TONE Ringbacktone = {440, 480,   0, -20,   -20, -100,  2000, 4000};
-#endif
-
-/* grunt tone defn's */
-#if 0
-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 } } };
-#endif
-static VPB_DETECT toned_ungrunt = { 2, VPB_GRUNT, 1, 2000, 1, 0, 0, -40, 0, 0, 30, 40, { { 0, 0, 0, 0 } } };
-
-/* Use loop polarity detection for CID */
-static int UsePolarityCID=0;
-
-/* Use loop drop detection */
-static int UseLoopDrop=1;
-
-/* To use or not to use Native bridging */
-static int UseNativeBridge=1;
-
-/* Use Asterisk Indication or VPB */
-static int use_ast_ind=0;
-
-/* Use Asterisk DTMF detection or VPB */
-static int use_ast_dtmfdet=0;
-
-static int relaxdtmf=0;
-
-/* Use Asterisk DTMF play back or VPB */
-static int use_ast_dtmf=0;
-
-/* Break for DTMF on native bridge ? */
-static int break_for_dtmf=1;
-
-/* Set EC suppression threshold */
-static short ec_supp_threshold=-1;
-
-/* Inter Digit Delay for collecting DTMF's */
-static int dtmf_idd = 3000;
-
-#define TIMER_PERIOD_RINGBACK 2000
-#define TIMER_PERIOD_BUSY 700
-#define TIMER_PERIOD_RING 4000
-static int timer_period_ring = TIMER_PERIOD_RING;
-
-#define VPB_EVENTS_ALL (VPB_MRING|VPB_MDIGIT|VPB_MDTMF|VPB_MTONEDETECT|VPB_MTIMEREXP \
-			|VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \
-			|VPB_MRING_OFF|VPB_MDROP|VPB_MSTATION_FLASH)
-#define VPB_EVENTS_NODROP (VPB_MRING|VPB_MDIGIT|VPB_MDTMF|VPB_MTONEDETECT|VPB_MTIMEREXP \
-			|VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \
-			|VPB_MRING_OFF|VPB_MSTATION_FLASH)
-#define VPB_EVENTS_NODTMF (VPB_MRING|VPB_MDIGIT|VPB_MTONEDETECT|VPB_MTIMEREXP \
-			|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_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, VPB_CALL_DISCONNECT, 0 },
-  				{ VPB_DIAL, VPB_CALL_DIALTONE, 0 },
-				{ VPB_RINGBACK, VPB_CALL_RINGBACK, 0 },
-				{ VPB_BUSY, 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
-
-#define VPB_GOT_RXHWG		1
-#define VPB_GOT_TXHWG		2
-#define VPB_GOT_RXSWG		4
-#define VPB_GOT_TXSWG		8
-
-typedef struct  {
-	int inuse;
-	struct ast_channel *c0, *c1, **rc;
-	struct ast_frame **fo;
-	int flags;
-	ast_mutex_t lock;
-	ast_cond_t cond;
-	int endbridge;
-} vpb_bridge_t;
-
-static vpb_bridge_t * bridges;
-static int max_bridges = MAX_BRIDGES_V4PCI;
-
-AST_MUTEX_DEFINE_STATIC(bridge_lock);
-
-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 who owns us, possibly NULL */
-
-	int golock;                       /*!< Got owner lock ? */
-
-	int mode;                         /*!< fxo/imediate/dialtone */
-	int handle;                       /*!< Handle for vpb interface */
-
-	int state;                        /*!< used to keep port state (internal to driver) */
-
-	int group;                        /*!< Which group this port belongs to */
-	ast_group_t callgroup;            /*!< Call group */
-	ast_group_t pickupgroup;          /*!< Pickup group */
-
-
-	char dev[256];                    /*!< Device name, eg vpb/1-1 */
-	vpb_model_t vpb_model;            /*!< card model */
-
-	struct ast_frame f, fr;           /*!< Asterisk frame interface */
-	char buf[VPB_MAX_BUF];            /*!< Static buffer for reading frames */
-
-	int dialtone;                     /*!< NOT USED */
-	float txgain, rxgain;             /*!< Hardware gain control */
-	float txswgain, rxswgain;         /*!< Software gain control */
-
-	int wantdtmf;                     /*!< Waiting for DTMF. */
-	char context[AST_MAX_EXTENSION];  /*!< The context for this channel */
-
-	char ext[AST_MAX_EXTENSION];      /*!< DTMF buffer for the ext[ens] */
-	char language[MAX_LANGUAGE];      /*!< language being used */
-	char callerid[AST_MAX_EXTENSION]; /*!< CallerId used for directly connected phone */
-	int  callerid_type;               /*!< Caller ID type: 0=>none 1=>vpb 2=>AstV23 3=>AstBell */
-	char cid_num[AST_MAX_EXTENSION];
-	char cid_name[AST_MAX_EXTENSION];
-
-	int dtmf_caller_pos;              /*!< DTMF CallerID detection (Brazil)*/
-
-	int lastoutput;                   /*!< Holds the last Audio format output'ed */
-	int lastinput;                    /*!< Holds the last Audio format input'ed */
-	int last_ignore_dtmf;
-
-	void *busy_timer;                 /*!< Void pointer for busy vpb_timer */
-	int busy_timer_id;                /*!< unique timer ID for busy timer */
-
-	void *ringback_timer;             /*!< Void pointer for ringback vpb_timer */
-	int ringback_timer_id;            /*!< unique timer ID for ringback timer */
-
-	void *ring_timer;                 /*!< Void pointer for ring vpb_timer */
-	int ring_timer_id;                /*!< unique timer ID for ring timer */
-
-	void *dtmfidd_timer;              /*!< Void pointer for DTMF IDD vpb_timer */
-	int dtmfidd_timer_id;             /*!< unique timer ID for DTMF IDD timer */
-
-	struct ast_dsp *vad;              /*!< AST  Voice Activation Detection dsp */
-
-	struct timeval lastgrunt;         /*!< time stamp of last grunt event */
-
-	ast_mutex_t lock;                 /*!< This one just protects bridge ptr below */
-	vpb_bridge_t *bridge;
-
-	int stopreads;                    /*!< Stop reading...*/
-	int read_state;                   /*!< Read state */
-	int chuck_count;                  /*!< a count of packets weve chucked away!*/
-	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 */
-	int  play_buf_time;               /*!< How long the last play_buf took */
-	struct timeval lastplay;          /*!< Last play time */
-
-	ast_mutex_t play_dtmf_lock;
-	char play_dtmf[16];
-
-	int faxhandled;                   /*!< has a fax tone been handled ? */
-
-	struct vpb_pvt *next;             /*!< Next channel in list */
-
-} *iflist = NULL;
-
-static struct ast_channel *vpb_new(struct vpb_pvt *i, enum ast_channel_state state, const char *context, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor);
-static void *do_chanreads(void *pvt);
-static struct ast_channel *vpb_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause);
-static int vpb_digit_begin(struct ast_channel *ast, char digit);
-static int vpb_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
-static int vpb_call(struct ast_channel *ast, const char *dest, int timeout);
-static int vpb_hangup(struct ast_channel *ast);
-static int vpb_answer(struct ast_channel *ast);
-static struct ast_frame *vpb_read(struct ast_channel *ast);
-static int vpb_write(struct ast_channel *ast, struct ast_frame *frame);
-static int vpb_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen);
-static int vpb_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-
-static struct ast_channel_tech vpb_tech = {
-	.type = "vpb",
-	.description = tdesc,
-	.capabilities = NULL,
-	.properties = 0,
-	.requester = vpb_request,
-	.requester_with_stream_topology = NULL,
-	.devicestate = NULL,
-	.presencestate = NULL,
-	.send_digit_begin = vpb_digit_begin,
-	.send_digit_end = vpb_digit_end,
-	.call = vpb_call,
-	.hangup = vpb_hangup,
-	.answer = vpb_answer,
-	.answer_with_stream_topology = NULL,
-	.read = vpb_read,
-	.read_stream = NULL,
-	.write = vpb_write,
-	.write_stream = NULL,
-	.send_text = NULL,
-	.send_image = NULL,
-	.send_html = NULL,
-	.exception = NULL,
-	.early_bridge = NULL,
-	.indicate = vpb_indicate,
-	.fixup = vpb_fixup,
-	.setoption = NULL,
-	.queryoption = NULL,
-	.transfer = NULL,
-	.write_video = NULL,
-	.write_text = NULL,
-	.func_channel_read = NULL,
-	.func_channel_write = NULL,
-};
-
-static struct ast_channel_tech vpb_tech_indicate = {
-	.type = "vpb",
-	.description = tdesc,
-	.capabilities = NULL,
-	.properties = 0,
-	.requester = vpb_request,
-	.requester_with_stream_topology = NULL,
-	.devicestate = NULL,
-	.presencestate = NULL,
-	.send_digit_begin = vpb_digit_begin,
-	.send_digit_end = vpb_digit_end,
-	.call = vpb_call,
-	.hangup = vpb_hangup,
-	.answer = vpb_answer,
-	.answer_with_stream_topology = NULL,
-	.read = vpb_read,
-	.read_stream = NULL,
-	.write = vpb_write,
-	.write_stream = NULL,
-	.send_text = NULL,
-	.send_image = NULL,
-	.send_html = NULL,
-	.exception = NULL,
-	.early_bridge = NULL,
-	.indicate = NULL,
-	.fixup = vpb_fixup,
-	.setoption = NULL,
-	.queryoption = NULL,
-	.transfer = NULL,
-	.write_video = NULL,
-	.write_text = NULL,
-	.func_channel_read = NULL,
-	.func_channel_write = NULL,
-};
-
-#if defined(VPB_NATIVE_BRIDGING)
-/* Can't get ast_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 */
-
-/* This is the Native bridge code, which Asterisk will try before using its own bridging code */
-static enum ast_bridge_result ast_vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms)
-{
-	struct vpb_pvt *p0 = (struct vpb_pvt *)ast_channel_tech_pvt(c0);
-	struct vpb_pvt *p1 = (struct vpb_pvt *)ast_channel_tech_pvt(c1);
-	int i;
-	int res;
-	struct ast_channel *cs[3];
-	struct ast_channel *who;
-	struct ast_frame *f;
-
-	cs[0] = c0;
-	cs[1] = c1;
-
-	#ifdef BAD_V4PCI_BRIDGE
-	if (p0->vpb_model == vpb_model_v4pci)
-		return AST_BRIDGE_FAILED_NOWARN;
-	#endif
-	if (UseNativeBridge != 1) {
-		return AST_BRIDGE_FAILED_NOWARN;
-	}
-
-/*
-	ast_mutex_lock(&p0->lock);
-	ast_mutex_lock(&p1->lock);
-*/
-
-	/* 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_unlock(&bridge_lock);
-
-	if (i == max_bridges) {
-		ast_log(LOG_WARNING, "%s: vpb_bridge: Failed to bridge %s and %s!\n", p0->dev, ast_channel_name(c0), ast_channel_name(c1));
-		ast_mutex_unlock(&p0->lock);
-		ast_mutex_unlock(&p1->lock);
-		return AST_BRIDGE_FAILED_NOWARN;
-	} 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);
-
-		ast_verb(2, "%s: vpb_bridge: Bridging call entered with [%s, %s]\n", p0->dev, ast_channel_name(c0), ast_channel_name(c1));
-	}
-
-	ast_verb(3, "Native bridging %s and %s\n", ast_channel_name(c0), ast_channel_name(c1));
-
-	#ifdef HALF_DUPLEX_BRIDGE
-
-	ast_debug(2, "%s: vpb_bridge: Starting half-duplex bridge [%s, %s]\n", p0->dev, ast_channel_name(c0), ast_channel_name(c1));
-
-	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);
-
-	ast_debug(2, "%s: vpb_bridge: Finished half-duplex bridge [%s, %s]\n", p0->dev, ast_channel_name(c0), ast_channel_name(c1));
-
-	res = VPB_OK;
-
-	#else
-
-	res = vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_ON);
-	if (res == VPB_OK) {
-		/* pthread_cond_wait(&bridges[i].cond, &bridges[i].lock);*/ /* Wait for condition signal. */
-		while (!bridges[i].endbridge) {
-			/* Are we really ment to be doing nothing ?!?! */
-			who = ast_waitfor_n(cs, 2, &timeoutms);
-			if (!who) {
-				if (!timeoutms) {
-					res = AST_BRIDGE_RETRY;
-					break;
-				}
-				ast_debug(1, "%s: vpb_bridge: Empty frame read...\n", p0->dev);
-				/* check for hangup / whentohangup */
-				if (ast_check_hangup(c0) || ast_check_hangup(c1))
-					break;
-				continue;
-			}
-			f = ast_read(who);
-			if (!f || ((f->frametype == AST_FRAME_DTMF) &&
-					   (((who == c0) && (flags & AST_BRIDGE_DTMF_CHANNEL_0)) ||
-				       ((who == c1) && (flags & AST_BRIDGE_DTMF_CHANNEL_1))))) {
-				*fo = f;
-				*rc = who;
-				ast_debug(1, "%s: vpb_bridge: Got a [%s]\n", p0->dev, f ? "digit" : "hangup");
-#if 0
-				if ((c0->tech_pvt == pvt0) && (!ast_check_hangup(c0))) {
-					if (pr0->set_rtp_peer(c0, NULL, NULL, 0))
-						ast_log(LOG_WARNING, "Channel '%s' failed to revert\n", c0->name);
-				}
-				if ((c1->tech_pvt == pvt1) && (!ast_check_hangup(c1))) {
-					if (pr1->set_rtp_peer(c1, NULL, NULL, 0))
-						ast_log(LOG_WARNING, "Channel '%s' failed to revert back\n", c1->name);
-				}
-				/* That's all we needed */
-				return 0;
-#endif
-				/* Check if we need to break */
-				if (break_for_dtmf) {
-					break;
-				} else if ((f->frametype == AST_FRAME_DTMF) && ((f->subclass.integer == '#') || (f->subclass.integer == '*'))) {
-					break;
-				}
-			} else {
-				if ((f->frametype == AST_FRAME_DTMF) ||
-					(f->frametype == AST_FRAME_VOICE) ||
-					(f->frametype == AST_FRAME_VIDEO))
-					{
-					/* Forward voice or DTMF frames if they happen upon us */
-					/* Actually I dont think we want to forward on any frames!
-					if (who == c0) {
-						ast_write(c1, f);
-					} else if (who == c1) {
-						ast_write(c0, f);
-					}
-					*/
-				}
-				ast_frfree(f);
-			}
-			/* Swap priority not that it's a big deal at this point */
-			cs[2] = cs[0];
-			cs[0] = cs[1];
-			cs[1] = cs[2];
-		};
-		vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_OFF);
-	}
-
-	#endif
-
-	ast_mutex_lock(&bridge_lock);
-	bridges[i].inuse = 0;
-	ast_mutex_unlock(&bridge_lock);
-
-	p0->bridge = NULL;
-	p1->bridge = NULL;
-
-
-	ast_verb(2, "Bridging call done with [%s, %s] => %d\n", ast_channel_name(c0), ast_channel_name(c1), res);
-
-/*
-	ast_mutex_unlock(&p0->lock);
-	ast_mutex_unlock(&p1->lock);
-*/
-	return (res == VPB_OK) ? AST_BRIDGE_COMPLETE : AST_BRIDGE_FAILED;
-}
-#endif	/* defined(VPB_NATIVE_BRIDGING) */
-
-/* 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 300
-#define CID_MSECS 2000
-
-static void get_callerid(struct vpb_pvt *p)
-{
-	short buf[CID_MSECS*8]; /* 8kHz sampling rate */
-	struct timeval cid_record_time;
-	int rc;
-	struct ast_channel *owner = p->owner;
-/*
-	char callerid[AST_MAX_EXTENSION] = "";
-*/
-#ifdef ANALYSE_CID
-	void * ws;
-	char * file="cidsams.wav";
-#endif
-
-
-	if (ast_mutex_trylock(&p->record_lock) == 0) {
-
-		cid_record_time = ast_tvnow();
-		ast_verb(4, "CID record - start\n");
-
-		/* Skip any trailing ringtone */
-		if (UsePolarityCID != 1){
-			vpb_sleep(RING_SKIP);
-		}
-
-		ast_verb(4, "CID record - skipped %lldms trailing ring\n",
-				 (long long int) ast_tvdiff_ms(ast_tvnow(), cid_record_time));
-		cid_record_time = ast_tvnow();
-
-		/* 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);
-#ifdef ANALYSE_CID
-		vpb_wave_open_write(&ws, file, VPB_LINEAR);
-		vpb_wave_write(ws, (char *)buf, sizeof(buf));
-		vpb_wave_close_write(ws);
-#endif
-
-		ast_verb(4, "CID record - recorded %lldms between rings\n",
-				 (long long int) ast_tvdiff_ms(ast_tvnow(), 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;
-		}
-
-		VPB_CID *cli_struct = new VPB_CID;
-		cli_struct->ra_cldn[0] = 0;
-		cli_struct->ra_cn[0] = 0;
-		/* This decodes FSK 1200baud type callerid */
-		if ((rc = vpb_cid_decode2(cli_struct, buf, CID_MSECS * 8)) == VPB_OK ) {
-			/*
-			if (owner->cid.cid_num)
-				ast_free(owner->cid.cid_num);
-			owner->cid.cid_num=NULL;
-			if (owner->cid.cid_name)
-				ast_free(owner->cid.cid_name);
-			owner->cid.cid_name=NULL;
-			*/
-
-			if (cli_struct->ra_cldn[0] == '\0') {
-				/*
-				owner->cid.cid_num = ast_strdup(cli_struct->cldn);
-				owner->cid.cid_name = ast_strdup(cli_struct->cn);
-				*/
-				if (owner) {
-					ast_set_callerid(owner, cli_struct->cldn, cli_struct->cn, cli_struct->cldn);
-				} else {
-					strcpy(p->cid_num, cli_struct->cldn);
-					strcpy(p->cid_name, cli_struct->cn);
-				}
-				ast_verb(4, "CID record - got [%s] [%s]\n",
-					S_COR(ast_channel_caller(owner)->id.number.valid, ast_channel_caller(owner)->id.number.str, ""),
-					S_COR(ast_channel_caller(owner)->id.name.valid, ast_channel_caller(owner)->id.name.str, ""));
-				snprintf(p->callerid, sizeof(p->callerid), "%s %s", cli_struct->cldn, cli_struct->cn);
-			} else {
-				ast_log(LOG_ERROR, "CID record - No caller id avalable on %s \n", p->dev);
-			}
-
-		} else {
-			ast_log(LOG_ERROR, "CID record - Failed to decode caller id on %s - %d\n", p->dev, rc);
-			ast_copy_string(p->callerid, "unknown", sizeof(p->callerid));
-		}
-		delete cli_struct;
-
-	} else
-		ast_log(LOG_ERROR, "CID record - Failed to set record mode for caller id on %s\n", p->dev);
-}
-
-static void get_callerid_ast(struct vpb_pvt *p)
-{
-	struct callerid_state *cs;
-	char buf[1024];
-	char *name = NULL, *number = NULL;
-	int flags;
-	int rc = 0, vrc;
-	int sam_count = 0;
-	struct ast_channel *owner = p->owner;
-	int which_cid;
-/*
-	float old_gain;
-*/
-#ifdef ANALYSE_CID
-	void * ws;
-	char * file = "cidsams.wav";
-#endif
-
-	if (p->callerid_type == 1) {
-		ast_verb(4, "Collected caller ID already\n");
-		return;
-	}
-	else if (p->callerid_type == 2 ) {
-		which_cid = CID_SIG_V23;
-		ast_verb(4, "Collecting Caller ID v23...\n");
-	}
-	else if (p->callerid_type == 3) {
-		which_cid = CID_SIG_BELL;
-		ast_verb(4, "Collecting Caller ID bell...\n");
-	} else {
-		ast_verb(4, "Caller ID disabled\n");
-		return;
-	}
-/*	vpb_sleep(RING_SKIP); */
-/*	vpb_record_get_gain(p->handle, &old_gain); */
-	cs = callerid_new(which_cid);
-	if (cs) {
-#ifdef ANALYSE_CID
-		vpb_wave_open_write(&ws, file, VPB_MULAW);
-		vpb_record_set_gain(p->handle, 3.0);
-		vpb_record_set_hw_gain(p->handle, 12.0);
-#endif
-		vpb_record_buf_start(p->handle, VPB_MULAW);
-		while ((rc == 0) && (sam_count < 8000 * 3)) {
-			vrc = vpb_record_buf_sync(p->handle, (char*)buf, sizeof(buf));
-			if (vrc != VPB_OK)
-				ast_log(LOG_ERROR, "%s: Caller ID couldn't read audio buffer!\n", p->dev);
-			rc = callerid_feed(cs, (unsigned char *)buf, sizeof(buf), ast_format_ulaw);
-#ifdef ANALYSE_CID
-			vpb_wave_write(ws, (char *)buf, sizeof(buf));
-#endif
-			sam_count += sizeof(buf);
-			ast_verb(4, "Collecting Caller ID samples [%d][%d]...\n", sam_count, rc);
-		}
-		vpb_record_buf_finish(p->handle);
-#ifdef ANALYSE_CID
-		vpb_wave_close_write(ws);
-#endif
-		if (rc == 1) {
-			callerid_get(cs, &name, &number, &flags);
-			ast_debug(1, "%s: Caller ID name [%s] number [%s] flags [%d]\n", p->dev, name, number, flags);
-		} else {
-			ast_log(LOG_ERROR, "%s: Failed to decode Caller ID \n", p->dev);
-		}
-/*		vpb_record_set_gain(p->handle, old_gain); */
-/*		vpb_record_set_hw_gain(p->handle,6.0); */
-	} else {
-		ast_log(LOG_ERROR, "%s: Failed to create Caller ID struct\n", p->dev);
-	}
-	ast_party_number_free(&ast_channel_caller(owner)->id.number);
-	ast_party_number_init(&ast_channel_caller(owner)->id.number);
-	ast_party_name_free(&ast_channel_caller(owner)->id.name);
-	ast_party_name_init(&ast_channel_caller(owner)->id.name);
-	if (number)
-		ast_shrink_phone_number(number);
-	ast_set_callerid(owner,
-		number, name,
-		ast_channel_caller(owner)->ani.number.valid ? NULL : number);
-	if (!ast_strlen_zero(name)){
-		snprintf(p->callerid, sizeof(p->callerid), "%s %s", number, name);
-	} else {
-		ast_copy_string(p->callerid, number, sizeof(p->callerid));
-	}
-	if (cs)
-		callerid_free(cs);
-}
-
-/* Terminate any tones we are presently playing */
-static void stoptone(int handle)
-{
-	int ret;
-	VPB_EVENT je;
-	while (vpb_playtone_state(handle) != VPB_OK) {
-		vpb_tone_terminate(handle);
-		ret = vpb_get_event_ch_async(handle, &je);
-		if ((ret == VPB_OK) && (je.type != VPB_DIALEND)) {
-			ast_verb(4, "Stop tone collected a wrong event!![%d]\n", je.type);
-/*			vpb_put_event(&je); */
-		}
-		vpb_sleep(10);
-	}
-}
-
-/* Safe vpb_playtone_async */
-static int playtone( int handle, VPB_TONE *tone)
-{
-	int ret = VPB_OK;
-	stoptone(handle);
-	ast_verb(4, "[%02d]: Playing tone\n", handle);
-	ret = vpb_playtone_async(handle, tone);
-	return ret;
-}
-
-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;
-
-	ast_verb(4, "%s: handle_owned: got event: [%d=>%d]\n", p->dev, e->type, e->data);
-
-	f.src = "vpb";
-	switch (e->type) {
-	case VPB_RING:
-		if (p->mode == MODE_FXO) {
-			f.subclass.integer = AST_CONTROL_RING;
-			vpb_timer_stop(p->ring_timer);
-			vpb_timer_start(p->ring_timer);
-		} else
-			f.frametype = AST_FRAME_NULL; /* ignore ring on station port. */
-		break;
-
-	case VPB_RING_OFF:
-		f.frametype = AST_FRAME_NULL;
-		break;
-
-	case VPB_TIMEREXP:
-		if (e->data == p->busy_timer_id) {
-			playtone(p->handle, &Busytone);
-			p->state = VPB_STATE_PLAYBUSY;
-			vpb_timer_stop(p->busy_timer);
-			vpb_timer_start(p->busy_timer);
-			f.frametype = AST_FRAME_NULL;
-		} else if (e->data == p->ringback_timer_id) {
-			playtone(p->handle, &Ringbacktone);
-			vpb_timer_stop(p->ringback_timer);
-			vpb_timer_start(p->ringback_timer);
-			f.frametype = AST_FRAME_NULL;
-		} else if (e->data == p->ring_timer_id) {
-			/* We didnt get another ring in time! */
-			if (ast_channel_state(p->owner) != AST_STATE_UP)  {
-				 /* Assume caller has hung up */
-				vpb_timer_stop(p->ring_timer);
-				f.subclass.integer = AST_CONTROL_HANGUP;
-			} else {
-				vpb_timer_stop(p->ring_timer);
-				f.frametype = AST_FRAME_NULL;
-			}
-
-		} else {
-				f.frametype = AST_FRAME_NULL; /* Ignore. */
-		}
-		break;
-
-	case VPB_DTMF_DOWN:
-	case VPB_DTMF:
-		if (use_ast_dtmfdet) {
-			f.frametype = AST_FRAME_NULL;
-		} else if (ast_channel_state(p->owner) == AST_STATE_UP) {
-			f.frametype = AST_FRAME_DTMF;
-			f.subclass.integer = e->data;
-		} else
-			f.frametype = AST_FRAME_NULL;
-		break;
-
-	case VPB_TONEDETECT:
-		if (e->data == VPB_BUSY || e->data == VPB_BUSY_308 || e->data == VPB_BUSY_AUST ) {
-			ast_debug(4, "%s: handle_owned: got event: BUSY\n", p->dev);
-			if (ast_channel_state(p->owner) == AST_STATE_UP) {
-				f.subclass.integer = AST_CONTROL_HANGUP;
-			} else {
-				f.subclass.integer = AST_CONTROL_BUSY;
-			}
-		} else if (e->data == VPB_FAX) {
-			if (!p->faxhandled) {
-				if (strcmp(ast_channel_exten(p->owner), "fax")) {
-					const char *target_context = S_OR(ast_channel_macrocontext(p->owner), ast_channel_context(p->owner));
-
-					if (ast_exists_extension(p->owner, target_context, "fax", 1,
-						S_COR(ast_channel_caller(p->owner)->id.number.valid, ast_channel_caller(p->owner)->id.number.str, NULL))) {
-						ast_verb(3, "Redirecting %s to fax extension\n", ast_channel_name(p->owner));
-						/* Save the DID/DNIS when we transfer the fax call to a "fax" extension */
-						pbx_builtin_setvar_helper(p->owner, "FAXEXTEN", ast_channel_exten(p->owner));
-						if (ast_async_goto(p->owner, target_context, "fax", 1)) {
-							ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast_channel_name(p->owner), target_context);
-						}
-					} else {
-						ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n");
-					}
-				} else {
-					ast_debug(1, "Already in a fax extension, not redirecting\n");
-				}
-			} else {
-				ast_debug(1, "Fax already handled\n");
-			}
-		} else if (e->data == VPB_GRUNT) {
-			if (ast_tvdiff_ms(ast_tvnow(), p->lastgrunt) > gruntdetect_timeout) {
-				/* Nothing heard on line for a very long time
-				 * Timeout connection */
-				ast_verb(3, "grunt timeout\n");
-				ast_log(LOG_NOTICE, "%s: Line hangup due of lack of conversation\n", p->dev);
-				f.subclass.integer = AST_CONTROL_HANGUP;
-			} else {
-				p->lastgrunt = ast_tvnow();
-				f.frametype = AST_FRAME_NULL;
-			}
-		} else {
-			f.frametype = AST_FRAME_NULL;
-		}
-		break;
-
-	case VPB_CALLEND:
-		#ifdef DIAL_WITH_CALL_PROGRESS
-		if (e->data == VPB_CALL_CONNECTED) {
-			f.subclass.integer = AST_CONTROL_ANSWER;
-		} else if (e->data == VPB_CALL_NO_DIAL_TONE || e->data == VPB_CALL_NO_RING_BACK) {
-			f.subclass.integer =  AST_CONTROL_CONGESTION;
-		} else if (e->data == VPB_CALL_NO_ANSWER || e->data == VPB_CALL_BUSY) {
-			f.subclass.integer = AST_CONTROL_BUSY;
-		} else if (e->data  == VPB_CALL_DISCONNECTED) {
-			f.subclass.integer = AST_CONTROL_HANGUP;
-		}
-		#else
-		ast_log(LOG_NOTICE, "%s: Got call progress callback but blind dialing \n", p->dev);
-		f.frametype = AST_FRAME_NULL;
-		#endif
-		break;
-
-	case VPB_STATION_OFFHOOK:
-		f.subclass.integer = AST_CONTROL_ANSWER;
-		break;
-
-	case VPB_DROP:
-		if ((p->mode == MODE_FXO) && (UseLoopDrop)) { /* ignore loop drop on stations */
-			if (ast_channel_state(p->owner) == AST_STATE_UP) {
-				f.subclass.integer = AST_CONTROL_HANGUP;
-			} else {
-				f.frametype = AST_FRAME_NULL;
-			}
-		}
-		break;
-	case VPB_LOOP_ONHOOK:
-		if (ast_channel_state(p->owner) == AST_STATE_UP) {
-			f.subclass.integer = AST_CONTROL_HANGUP;
-		} else {
-			f.frametype = AST_FRAME_NULL;
-		}
-		break;
-	case VPB_STATION_ONHOOK:
-		f.subclass.integer = AST_CONTROL_HANGUP;
-		break;
-
-	case VPB_STATION_FLASH:
-		f.subclass.integer = 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:
-		if (p->state < 5) {
-			f.subclass.integer = AST_CONTROL_ANSWER;
-			ast_verb(2, "%s: Dialend\n", p->dev);
-		} else {
-			f.frametype = AST_FRAME_NULL;
-		}
-		break;
-
-/*	case VPB_PLAY_UNDERFLOW:
-		f.frametype = AST_FRAME_NULL;
-		vpb_reset_play_fifo_alarm(p->handle);
-		break;
-
-	case VPB_RECORD_OVERFLOW:
-		f.frametype = AST_FRAME_NULL;
-		vpb_reset_record_fifo_alarm(p->handle);
-		break;
-*/
-	default:
-		f.frametype = AST_FRAME_NULL;
-		break;
-	}
-
-/*
-	ast_verb(4, "%s: LOCKING in handle_owned [%d]\n", p->dev,res);
-	res = ast_mutex_lock(&p->lock);
-	ast_verb(4, "%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
-*/
-	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:
-			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;
-			ast_cond_signal(&p->bridge->cond);
-			ast_mutex_unlock(&p->bridge->lock);
-		}
-	}
-
-	if (endbridge) {
-		ast_mutex_unlock(&p->lock);
-/*
-		ast_verb(4, "%s: unLOCKING in handle_owned [%d]\n", p->dev,res);
-*/
-		return 0;
-	}
-
-	ast_verb(4, "%s: handle_owned: Prepared frame type[%d]subclass[%d], bridge=%p owner=[%s]\n",
-			p->dev, f.frametype, f.subclass.integer, (void *)p->bridge, ast_channel_name(p->owner));
-
-	/* 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) && (p->owner)) {
-		if (ast_channel_trylock(p->owner) == 0) {
-			ast_queue_frame(p->owner, &f);
-			ast_channel_unlock(p->owner);
-			ast_verb(4, "%s: handled_owned: Queued Frame to [%s]\n", p->dev, ast_channel_name(p->owner));
-		} else {
-			ast_verbose("%s: handled_owned: Missed event %d/%d \n",
-				p->dev, f.frametype, f.subclass.integer);
-		}
-	}
-	ast_mutex_unlock(&p->lock);
-/*
-	ast_verb(4, "%s: unLOCKING in handle_owned [%d]\n", p->dev,res);
-*/
-
-	return 0;
-}
-
-static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e)
-{
-	char s[2] = {0};
-	struct ast_channel *owner = p->owner;
-	char cid_num[256];
-	char cid_name[256];
-/*
-	struct ast_channel *c;
-*/
-
-	char str[VPB_MAX_STR];
-
-	vpb_translate_event(e, str);
-	ast_verb(4, "%s: handle_notowned: mode=%d, event[%d][%s]=[%d]\n", p->dev, p->mode, e->type,str, e->data);
-
-	switch (e->type) {
-	case VPB_LOOP_ONHOOK:
-	case VPB_LOOP_POLARITY:
-		if (UsePolarityCID == 1) {
-			ast_verb(4, "Polarity reversal\n");
-			if (p->callerid_type == 1) {
-				ast_verb(4, "Using VPB Caller ID\n");
-				get_callerid(p);        /* UK CID before 1st ring*/
-			}
-/*			get_callerid_ast(p); */   /* Caller ID using the ast functions */
-		}
-		break;
-	case VPB_RING:
-		if (p->mode == MODE_FXO) /* FXO port ring, start * */ {
-			vpb_new(p, AST_STATE_RING, p->context, NULL, NULL);
-			if (UsePolarityCID != 1) {
-				if (p->callerid_type == 1) {
-					ast_verb(4, "Using VPB Caller ID\n");
-					get_callerid(p);        /* Australian CID only between 1st and 2nd ring  */
-				}
-				get_callerid_ast(p);    /* Caller ID using the ast functions */
-			} else {
-				ast_log(LOG_ERROR, "Setting caller ID: %s %s\n", p->cid_num, p->cid_name);
-				ast_set_callerid(p->owner, p->cid_num, p->cid_name, p->cid_num);
-				p->cid_num[0] = 0;
-				p->cid_name[0] = 0;
-			}
-
-			vpb_timer_stop(p->ring_timer);
-			vpb_timer_start(p->ring_timer);
-		}
-		break;
-
-	case VPB_RING_OFF:
-		break;
-
-	case VPB_STATION_OFFHOOK:
-		if (p->mode == MODE_IMMEDIATE) {
-			vpb_new(p,AST_STATE_RING, p->context, NULL, NULL);
-		} else {
-			ast_verb(4, "%s: handle_notowned: playing dialtone\n", p->dev);
-			playtone(p->handle, &Dialtone);
-			p->state = VPB_STATE_PLAYDIAL;
-			p->wantdtmf = 1;
-			p->ext[0] = 0;	/* Just to be sure & paranoid.*/
-		}
-		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. */
-			}
-#if 0
-			/* 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;
-			} else if (p->state == VPB_STATE_PLAYRING) {
-				playtone(p->handle, &Ringbacktone);
-				p->wantdtmf = 1;
-				p->ext[0] = 0;
-			}
-#endif
-		} else {
-			ast_verb(4, "%s: handle_notowned: Got a DIALEND when not really expected\n",p->dev);
-		}
-		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_TIMEREXP:
-		if (e->data == p->dtmfidd_timer_id) {
-			if (ast_exists_extension(NULL, p->context, p->ext, 1, p->callerid)){
-				ast_verb(4, "%s: handle_notowned: DTMF IDD timer out, matching on [%s] in [%s]\n", p->dev, p->ext, p->context);
-
-				vpb_new(p, AST_STATE_RING, p->context, NULL, NULL);
-			}
-		} else if (e->data == p->ring_timer_id) {
-			/* We didnt get another ring in time! */
-			if (p->owner) {
-				if (ast_channel_state(p->owner) != AST_STATE_UP) {
-					 /* Assume caller has hung up */
-					vpb_timer_stop(p->ring_timer);
-				}
-			} else {
-				 /* No owner any more, Assume caller has hung up */
-				vpb_timer_stop(p->ring_timer);
-			}
-		}
-		break;
-
-	case VPB_DTMF:
-		if (p->state == VPB_STATE_ONHOOK){
-			/* DTMF's being passed while on-hook maybe Caller ID */
-			if (p->mode == MODE_FXO) {
-				if (e->data == DTMF_CID_START) { /* CallerID Start signal */
-					p->dtmf_caller_pos = 0; /* Leaves the first digit out */
-					memset(p->callerid, 0, sizeof(p->callerid));
-				} else if (e->data == DTMF_CID_STOP) { /* CallerID End signal */
-					p->callerid[p->dtmf_caller_pos] = '\0';
-					ast_verb(3, " %s: DTMF CallerID %s\n", p->dev, p->callerid);
-					if (owner) {
-						/*
-						if (owner->cid.cid_num)
-							ast_free(owner->cid.cid_num);
-						owner->cid.cid_num=NULL;
-						if (owner->cid.cid_name)
-							ast_free(owner->cid.cid_name);
-						owner->cid.cid_name=NULL;
-						owner->cid.cid_num = strdup(p->callerid);
-						*/
-						cid_name[0] = '\0';
-						cid_num[0] = '\0';
-						ast_callerid_split(p->callerid, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num));
-						ast_set_callerid(owner, cid_num, cid_name, cid_num);
-
-					} else {
-						ast_verb(3, " %s: DTMF CallerID: no owner to assign CID \n", p->dev);
-					}
-				} else if (p->dtmf_caller_pos < AST_MAX_EXTENSION) {
-					if (p->dtmf_caller_pos >= 0) {
-						p->callerid[p->dtmf_caller_pos] = e->data;
-					}
-					p->dtmf_caller_pos++;
-				}
-			}
-			break;
-		}
-		if (p->wantdtmf == 1) {
-			stoptone(p->handle);
-			p->wantdtmf = 0;
-		}
-		p->state = VPB_STATE_GETDTMF;
-		s[0] = e->data;
-		strncat(p->ext, s, sizeof(p->ext) - strlen(p->ext) - 1);
-		#if 0
-		if (!strcmp(p->ext, ast_pickup_ext())) {
-			/* Call pickup has been dialled! */
-			if (ast_pickup_call(c)) {
-				/* Call pickup wasnt possible */
-			}
-		} else
-		#endif
-		if (ast_exists_extension(NULL, p->context, p->ext, 1, p->callerid)) {
-			if (ast_canmatch_extension(NULL, p->context, p->ext, 1, p->callerid)) {
-				ast_verb(4, "%s: handle_notowned: Multiple matches on [%s] in [%s]\n", p->dev, p->ext, p->context);
-				/* Start DTMF IDD timer */
-				vpb_timer_stop(p->dtmfidd_timer);
-				vpb_timer_start(p->dtmfidd_timer);
-			} else {
-				ast_verb(4, "%s: handle_notowned: Matched on [%s] in [%s]\n", p->dev, p->ext , p->context);
-				vpb_new(p, AST_STATE_UP, p->context, NULL, NULL);
-			}
-		} 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_UP, "default", NULL, NULL);
-			} else if (!ast_canmatch_extension(NULL, "default", p->ext, 1, p->callerid)) {
-				ast_verb(4, "%s: handle_notowned: can't match anything in %s or default\n", p->dev, p->context);
-				playtone(p->handle, &Busytone);
-				vpb_timer_stop(p->busy_timer);
-				vpb_timer_start(p->busy_timer);
-				p->state = VPB_STATE_PLAYBUSY;
-			}
-		}
-		break;
-
-	default:
-		/* Ignore.*/
-		break;
-	}
-
-	ast_verb(4, "%s: handle_notowned: mode=%d, [%d=>%d]\n", p->dev, p->mode, e->type, e->data);
-
-	return 0;
-}
-
-static void *do_monitor(void *unused)
-{
-
-	/* Monitor thread, doesn't die until explicitly killed. */
-
-	ast_verb(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;
-
-		/*
-		ast_verb(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)) {
-			/*
-			if (res == VPB_NO_EVENTS) {
-				ast_verb(4, "No events....\n");
-			} else {
-				ast_verb(4, "No events, timed out....\n");
-			}
-			*/
-			continue;
-		}
-
-		if (res != VPB_OK) {
-			ast_log(LOG_ERROR,"Monitor get event error %d\n", res );
-			ast_verbose("Monitor get event error %d\n", res );
-			continue;
-		}
-
-		str[0] = 0;
-
-		p = NULL;
-
-		ast_mutex_lock(&monlock);
-		if (e.type == VPB_NULL_EVENT) {
-			ast_verb(4, "Monitor got null event\n");
-		} else {
-			vpb_translate_event(&e, str);
-			if (*str && *(str + 1)) {
-				str[strlen(str) - 1] = '\0';
-			}
-
-			ast_mutex_lock(&iflock);
-			for (p = iflist; p && p->handle != e.handle; p = p->next);
-			ast_mutex_unlock(&iflock);
-
-			if (p) {
-				ast_verb(4, "%s: Event [%d=>%s]\n",
-					p ? p->dev : "null", e.type, str);
-			}
-		}
-
-		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);
-				ast_verb(4, "vpb/ERR: No interface for Event [%d=>%s] \n", e.type, str);
-			}
-			continue;
-		}
-
-		/* flush the event from the channel event Q */
-		vpb_get_event_ch_async(e.handle, &je);
-		vpb_translate_event(&je, str);
-		ast_verb(5, "%s: Flushing event [%d]=>%s\n", p->dev, je.type, str);
-
-		/* Check for ownership and locks */
-		if ((p->owner) && (!p->golock)) {
-			/* Need to get owner lock */
-			/* Safely grab both p->lock and p->owner->lock so that there
-			cannot be a race with something from the other side */
-			/*
-			ast_mutex_lock(&p->lock);
-			while (ast_mutex_trylock(&p->owner->lock)) {
-				ast_mutex_unlock(&p->lock);
-				usleep(1);
-				ast_mutex_lock(&p->lock);
-				if (!p->owner)
-					break;
-			}
-			if (p->owner)
-				p->golock = 1;
-			*/
-		}
-		/* Two scenarios: Are you owned or not. */
-		if (p->owner) {
-			monitor_handle_owned(p, &e);
-		} else {
-			monitor_handle_notowned(p, &e);
-		}
-		/* if ((!p->owner)&&(p->golock)) {
-			ast_mutex_unlock(&p->owner->lock);
-			ast_mutex_unlock(&p->lock);
-		}
-		*/
-
-	}
-
-	return NULL;
-}
-
-static int restart_monitor(void)
-{
-	int error = 0;
-
-	/* If we're supposed to be stopped -- stay stopped */
-	if (mthreadactive == -2)
-		return 0;
-
-	ast_verb(4, "Restarting monitor\n");
-
-	ast_mutex_lock(&monlock);
-	if (monitor_thread == pthread_self()) {
-		ast_log(LOG_WARNING, "Cannot kill myself\n");
-		error = -1;
-		ast_verb(4, "Monitor trying to kill monitor\n");
-	} else {
-		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_EVT_NONE;
-			e.data = 0;
-
-			ast_verb(4, "Trying to reawake monitor\n");
-
-			vpb_put_event(&e);
-		} else {
-			/* Start a new monitor */
-			int pid = ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL);
-			ast_verb(4, "Created new monitor thread %d\n", pid);
-			if (pid < 0) {
-				ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
-				error = -1;
-			} else {
-				mthreadactive = 0; /* Started the thread!*/
-			}
-		}
-	}
-	ast_mutex_unlock(&monlock);
-
-	ast_verb(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)
-{
-	if (!bridges) {
-		if (model == vpb_model_v4pci) {
-			max_bridges = MAX_BRIDGES_V4PCI;
-		}
-		bridges = (vpb_bridge_t *)ast_calloc(1, max_bridges * sizeof(vpb_bridge_t));
-		if (!bridges) {
-			ast_log(LOG_ERROR, "Failed to initialize bridges\n");
-		} else {
-			int i;
-			for (i = 0; i < max_bridges; i++) {
-				ast_mutex_init(&bridges[i].lock);
-				ast_cond_init(&bridges[i].cond, NULL);
-			}
-		}
-	}
-	if (!echo_cancel) {
-		if (model == vpb_model_v4pci) {
-			vpb_echo_canc_disable();
-			ast_log(LOG_NOTICE, "Voicetronix echo cancellation OFF\n");
-		} else {
-			/* need to do 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");
-			if (ec_supp_threshold > -1) {
-				vpb_echo_canc_set_sup_thresh(0, &ec_supp_threshold);
-				ast_log(LOG_NOTICE, "Voicetronix EC Sup Thres set\n");
-			}
-		} else {
-			/* need to do it port by port for OpenSwitch */
-		}
-	}
-}
-
-static struct vpb_pvt *mkif(int board, int channel, int mode, int gains, float txgain, float rxgain,
-			 float txswgain, float rxswgain, int bal1, int bal2, int bal3,
-			 char * callerid, int echo_cancel, int group, ast_group_t callgroup, ast_group_t pickupgroup )
-{
-	struct vpb_pvt *tmp;
-	char buf[64];
-
-	tmp = (vpb_pvt *)ast_calloc(1, sizeof(*tmp));
-
-	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));
-		ast_free(tmp);
-		return NULL;
-	}
-
-	snprintf(tmp->dev, sizeof(tmp->dev), "vpb/%d-%d", board, channel);
-
-	tmp->mode = mode;
-
-	tmp->group = group;
-	tmp->callgroup = callgroup;
-	tmp->pickupgroup = pickupgroup;
-
-	/* Initialize dtmf caller ID position variable */
-	tmp->dtmf_caller_pos = 0;
-
-	ast_copy_string(tmp->language, language, sizeof(tmp->language));
-	ast_copy_string(tmp->context, context, sizeof(tmp->context));
-
-	tmp->callerid_type = 0;
-	if (callerid) {
-		if (strcasecmp(callerid, "on") == 0) {
-			tmp->callerid_type = 1;
-			ast_copy_string(tmp->callerid, "unknown", sizeof(tmp->callerid));
-		} else if (strcasecmp(callerid, "v23") == 0) {
-			tmp->callerid_type = 2;
-			ast_copy_string(tmp->callerid, "unknown", sizeof(tmp->callerid));
-		} else if (strcasecmp(callerid, "bell") == 0) {
-			tmp->callerid_type = 3;
-			ast_copy_string(tmp->callerid, "unknown", sizeof(tmp->callerid));
-		} else {
-			ast_copy_string(tmp->callerid, callerid, sizeof(tmp->callerid));
-		}
-	} else {
-		ast_copy_string(tmp->callerid, "unknown", sizeof(tmp->callerid));
-	}
-
-	/* 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);
-	}
-
-	if (gains & VPB_GOT_TXHWG) {
-		if (txgain > MAX_VPB_GAIN) {
-			tmp->txgain = MAX_VPB_GAIN;
-		} else if (txgain < MIN_VPB_GAIN) {
-			tmp->txgain = MIN_VPB_GAIN;
-		} else {
-			tmp->txgain = txgain;
-		}
-
-		ast_log(LOG_NOTICE, "VPB setting Tx Hw gain to [%f]\n", tmp->txgain);
-		vpb_play_set_hw_gain(tmp->handle, tmp->txgain);
-	}
-
-	if (gains & VPB_GOT_RXHWG) {
-		if (rxgain > MAX_VPB_GAIN) {
-			tmp->rxgain = MAX_VPB_GAIN;
-		} else if (rxgain < MIN_VPB_GAIN) {
-			tmp->rxgain = MIN_VPB_GAIN;
-		} else {
-			tmp->rxgain = rxgain;
-		}
-		ast_log(LOG_NOTICE, "VPB setting Rx Hw gain to [%f]\n", tmp->rxgain);
-		vpb_record_set_hw_gain(tmp->handle, tmp->rxgain);
-	}
-
-	if (gains & VPB_GOT_TXSWG) {
-		tmp->txswgain = txswgain;
-		ast_log(LOG_NOTICE, "VPB setting Tx Sw gain to [%f]\n", tmp->txswgain);
-		vpb_play_set_gain(tmp->handle, tmp->txswgain);
-	}
-
-	if (gains & VPB_GOT_RXSWG) {
-		tmp->rxswgain = rxswgain;
-		ast_log(LOG_NOTICE, "VPB setting Rx Sw gain to [%f]\n", tmp->rxswgain);
-		vpb_record_set_gain(tmp->handle, tmp->rxswgain);
-	}
-
-	tmp->vpb_model = vpb_model_unknown;
-	if (vpb_get_model(tmp->handle, 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->owner_lock);
-	ast_mutex_init(&tmp->lock);
-	ast_mutex_init(&tmp->record_lock);
-	ast_mutex_init(&tmp->play_lock);
-	ast_mutex_init(&tmp->play_dtmf_lock);
-
-	/* set default read state */
-	tmp->read_state = 0;
-
-	tmp->golock = 0;
-
-	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);
-
-	tmp->ring_timer_id = vpb_timer_get_unique_timer_id();
-	vpb_timer_open(&tmp->ring_timer, tmp->handle, tmp->ring_timer_id, timer_period_ring);
-
-	tmp->dtmfidd_timer_id = vpb_timer_get_unique_timer_id();
-	vpb_timer_open(&tmp->dtmfidd_timer, tmp->handle, tmp->dtmfidd_timer_id, dtmf_idd);
-
-	if (mode == MODE_FXO){
-		if (use_ast_dtmfdet)
-			vpb_set_event_mask(tmp->handle, VPB_EVENTS_NODTMF);
-		else
-			vpb_set_event_mask(tmp->handle, VPB_EVENTS_ALL);
-	} else {
-/*
-		if (use_ast_dtmfdet)
-			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);
-	}
-	if (use_ast_dtmfdet) {
-		tmp->vad = ast_dsp_new();
-		ast_dsp_set_features(tmp->vad, DSP_FEATURE_DIGIT_DETECT);
-		ast_dsp_set_digitmode(tmp->vad, DSP_DIGITMODE_DTMF);
-		if (relaxdtmf)
-			ast_dsp_set_digitmode(tmp->vad, DSP_DIGITMODE_DTMF|DSP_DIGITMODE_RELAXDTMF);
-	} else {
-		tmp->vad = NULL;
-	}
-
-	/* define grunt tone */
-	vpb_settonedet(tmp->handle,&toned_ungrunt);
-
-	ast_log(LOG_NOTICE,"Voicetronix %s channel %s initialized (rxsg=%f/txsg=%f/rxhg=%f/txhg=%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, const void *data, size_t datalen)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast);
-	int res = 0;
-
-	if (use_ast_ind == 1) {
-		ast_verb(4, "%s: vpb_indicate called when using Ast Indications !?!\n", p->dev);
-		return 0;
-	}
-
-	ast_verb(4, "%s: vpb_indicate [%d] state[%d]\n", p->dev, condition,ast_channel_state(ast));
-/*
-	if (ast->_state != AST_STATE_UP) {
-		ast_verb(4, "%s: vpb_indicate Not in AST_STATE_UP\n", p->dev, condition,ast->_state);
-		return res;
-	}
-*/
-
-/*
-	ast_verb(4, "%s: LOCKING in indicate \n", p->dev);
-	ast_verb(4, "%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count, p->lock.__m_owner);
-*/
-	ast_mutex_lock(&p->lock);
-	switch (condition) {
-	case AST_CONTROL_BUSY:
-	case AST_CONTROL_CONGESTION:
-		if (ast_channel_state(ast) == AST_STATE_UP) {
-			playtone(p->handle, &Busytone);
-			p->state = VPB_STATE_PLAYBUSY;
-			vpb_timer_stop(p->busy_timer);
-			vpb_timer_start(p->busy_timer);
-		}
-		break;
-	case AST_CONTROL_RINGING:
-		if (ast_channel_state(ast) == AST_STATE_UP) {
-			playtone(p->handle, &Ringbacktone);
-			p->state = VPB_STATE_PLAYRING;
-			ast_verb(4, "%s: vpb indicate: setting ringback timer [%d]\n", p->dev,p->ringback_timer_id);
-
-			vpb_timer_stop(p->ringback_timer);
-			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:
-		if (ast_channel_state(ast) == AST_STATE_UP) {
-			playtone(p->handle, &Busytone);
-			p->state = VPB_STATE_PLAYBUSY;
-			vpb_timer_stop(p->busy_timer);
-			vpb_timer_start(p->busy_timer);
-		}
-		break;
-	case AST_CONTROL_HOLD:
-		ast_moh_start(ast, (const char *) data, NULL);
-		break;
-	case AST_CONTROL_UNHOLD:
-		ast_moh_stop(ast);
-		break;
-	case AST_CONTROL_PVT_CAUSE_CODE:
-		res = -1;
-		break;
-	default:
-		res = 0;
-		break;
-	}
-	ast_mutex_unlock(&p->lock);
-	return res;
-}
-
-static int vpb_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(newchan);
-
-/*
-	ast_verb(4, "%s: LOCKING in fixup \n", p->dev);
-	ast_verb(4, "%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
-*/
-	ast_mutex_lock(&p->lock);
-	ast_debug(1, "New owner for channel %s is %s\n", p->dev, ast_channel_name(newchan));
-
-	if (p->owner == oldchan) {
-		p->owner = newchan;
-	}
-
-	if (ast_channel_state(newchan) == AST_STATE_RINGING){
-		if (use_ast_ind == 1) {
-			ast_verb(4, "%s: vpb_fixup Calling ast_indicate\n", p->dev);
-			ast_indicate(newchan, AST_CONTROL_RINGING);
-		} else {
-			ast_verb(4, "%s: vpb_fixup Calling vpb_indicate\n", p->dev);
-			vpb_indicate(newchan, AST_CONTROL_RINGING, NULL, 0);
-		}
-	}
-
-	ast_mutex_unlock(&p->lock);
-	return 0;
-}
-
-static int vpb_digit_begin(struct ast_channel *ast, char digit)
-{
-	/* XXX Modify this callback to let Asterisk control the length of DTMF */
-	return 0;
-}
-static int vpb_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast);
-	char s[2];
-
-	if (use_ast_dtmf) {
-		ast_verb(4, "%s: vpb_digit: asked to play digit[%c] but we are using asterisk dtmf play back?!\n", p->dev, digit);
-		return 0;
-	}
-
-/*
-	ast_verb(4, "%s: LOCKING in digit \n", p->dev);
-	ast_verb(4, "%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
-*/
-	ast_mutex_lock(&p->lock);
-
-
-	s[0] = digit;
-	s[1] = '\0';
-
-	ast_verb(4, "%s: vpb_digit: asked to play digit[%s]\n", p->dev, s);
-
-	ast_mutex_lock(&p->play_dtmf_lock);
-	strncat(p->play_dtmf, s, sizeof(p->play_dtmf) - strlen(p->play_dtmf) - 1);
-	ast_mutex_unlock(&p->play_dtmf_lock);
-
-	ast_mutex_unlock(&p->lock);
-	return 0;
-}
-
-/* Places a call out of a VPB channel */
-static int vpb_call(struct ast_channel *ast, const char *dest, int timeout)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast);
-	int res = 0, i;
-	const char *s = strrchr(dest, '/');
-	char dialstring[254] = "";
-
-/*
-	ast_verb(4, "%s: LOCKING in call \n", p->dev);
-	ast_verb(4, "%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
-*/
-	ast_mutex_lock(&p->lock);
-	ast_verb(4, "%s: starting call to [%s]\n", p->dev, dest);
-
-	if (s)
-		s = s + 1;
-	else
-		s = dest;
-	ast_copy_string(dialstring, s, sizeof(dialstring));
-	for (i = 0; dialstring[i] != '\0'; i++) {
-		if ((dialstring[i] == 'w') || (dialstring[i] == 'W'))
-			dialstring[i] = ',';
-		else if ((dialstring[i] == 'f') || (dialstring[i] == 'F'))
-			dialstring[i] = '&';
-	}
-
-	if (ast_channel_state(ast) != AST_STATE_DOWN && ast_channel_state(ast) != AST_STATE_RESERVED) {
-		ast_log(LOG_WARNING, "vpb_call on %s neither down nor reserved!\n", ast_channel_name(ast));
-		ast_mutex_unlock(&p->lock);
-		return -1;
-	}
-	if (p->mode != MODE_FXO)  /* Station port, ring it. */
-		vpb_ring_station_async(p->handle, 2);
-	else {
-		VPB_CALL call;
-		int j;
-
-		/* 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);
-
-		ast_verb(2, "%s: Calling %s on %s \n",p->dev, dialstring, ast_channel_name(ast));
-
-		ast_verb(2, "%s: Dial parms for %s %d/%dms/%dms/%dms/%dms\n", p->dev,
-				ast_channel_name(ast), 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_verb(2, "%s: Dial parms for %s tone %d->%d\n", p->dev,
-					ast_channel_name(ast), call.tone_map[j].tone_id, call.tone_map[j].call_id);
-		}
-
-		ast_verb(4, "%s: Disabling Loop Drop detection\n", p->dev);
-		vpb_disable_event(p->handle, VPB_MDROP);
-		vpb_sethook_sync(p->handle, VPB_OFFHOOK);
-		p->state = VPB_STATE_OFFHOOK;
-
-		#ifndef DIAL_WITH_CALL_PROGRESS
-		vpb_sleep(300);
-		ast_verb(4, "%s: Enabling Loop Drop detection\n", p->dev);
-		vpb_enable_event(p->handle, VPB_MDROP);
-		res = vpb_dial_async(p->handle, dialstring);
-		#else
-		ast_verb(4, "%s: Enabling Loop Drop detection\n", p->dev);
-		vpb_enable_event(p->handle, VPB_MDROP);
-		res = vpb_call_async(p->handle, dialstring);
-		#endif
-
-		if (res != VPB_OK) {
-			ast_debug(1, "Call on %s to %s failed: %d\n", ast_channel_name(ast), s, res);
-			res = -1;
-		} else
-			res = 0;
-	}
-
-	ast_verb(3, "%s: VPB Calling %s [t=%d] on %s returned %d\n", p->dev , s, timeout, ast_channel_name(ast), res);
-	if (res == 0) {
-		ast_setstate(ast, AST_STATE_RINGING);
-		ast_queue_control(ast, AST_CONTROL_RINGING);
-	}
-
-	if (!p->readthread) {
-		ast_pthread_create(&p->readthread, NULL, do_chanreads, (void *)p);
-	}
-
-	ast_mutex_unlock(&p->lock);
-	return res;
-}
-
-static int vpb_hangup(struct ast_channel *ast)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast);
-	VPB_EVENT je;
-	char str[VPB_MAX_STR];
-
-/*
-	ast_verb(4, "%s: LOCKING in hangup \n", p->dev);
-	ast_verb(4, "%s: LOCKING in hangup count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
-	ast_verb(4, "%s: LOCKING pthread_self(%d)\n", p->dev,pthread_self());
-	ast_mutex_lock(&p->lock);
-*/
-	ast_verb(2, "%s: Hangup requested\n", ast_channel_name(ast));
-
-	if (!ast_channel_tech(ast) || !ast_channel_tech_pvt(ast)) {
-		ast_log(LOG_WARNING, "%s: channel not connected?\n", ast_channel_name(ast));
-		ast_mutex_unlock(&p->lock);
-		/* Free up ast dsp if we have one */
-		if (use_ast_dtmfdet && p->vad) {
-			ast_dsp_free(p->vad);
-			p->vad = NULL;
-		}
-		return 0;
-	}
-
-
-
-	/* Stop record */
-	p->stopreads = 1;
-	if (p->readthread) {
-		pthread_join(p->readthread, NULL);
-		ast_verb(4, "%s: stopped record thread \n", ast_channel_name(ast));
-	}
-
-	/* Stop play */
-	if (p->lastoutput != -1) {
-		ast_verb(2, "%s: Ending play mode \n", ast_channel_name(ast));
-		vpb_play_terminate(p->handle);
-		ast_mutex_lock(&p->play_lock);
-		vpb_play_buf_finish(p->handle);
-		ast_mutex_unlock(&p->play_lock);
-	}
-
-	ast_verb(4, "%s: Setting state down\n", ast_channel_name(ast));
-	ast_setstate(ast, AST_STATE_DOWN);
-
-
-/*
-	ast_verb(4, "%s: LOCKING in hangup \n", p->dev);
-	ast_verb(4, "%s: LOCKING in hangup count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
-	ast_verb(4, "%s: LOCKING pthread_self(%d)\n", p->dev,pthread_self());
-*/
-	ast_mutex_lock(&p->lock);
-
-	if (p->mode != MODE_FXO) {
-		/* station port. */
-		vpb_ring_station_async(p->handle, 0);
-		if (p->state != VPB_STATE_ONHOOK) {
-			/* This is causing a "dial end" "play tone" loop
-			playtone(p->handle, &Busytone);
-			p->state = VPB_STATE_PLAYBUSY;
-			ast_verb(5, "%s: Station offhook[%d], playing busy tone\n",
-								ast->name,p->state);
-			*/
-		} else {
-			stoptone(p->handle);
-		}
-		#ifdef VPB_PRI
-		vpb_setloop_async(p->handle, VPB_OFFHOOK);
-		vpb_sleep(100);
-		vpb_setloop_async(p->handle, VPB_ONHOOK);
-		#endif
-	} else {
-		stoptone(p->handle); /* Terminates any dialing */
-		vpb_sethook_sync(p->handle, VPB_ONHOOK);
-		p->state=VPB_STATE_ONHOOK;
-	}
-	while (VPB_OK == vpb_get_event_ch_async(p->handle, &je)) {
-		vpb_translate_event(&je, str);
-		ast_verb(4, "%s: Flushing event [%d]=>%s\n", ast_channel_name(ast), je.type, str);
-	}
-
-	p->readthread = 0;
-	p->lastoutput = -1;
-	p->lastinput = -1;
-	p->last_ignore_dtmf = 1;
-	p->ext[0] = 0;
-	p->dialtone = 0;
-
-	p->owner = NULL;
-	ast_channel_tech_pvt_set(ast, NULL);
-
-	/* Free up ast dsp if we have one */
-	if (use_ast_dtmfdet && p->vad) {
-		ast_dsp_free(p->vad);
-		p->vad = NULL;
-	}
-
-	ast_verb(2, "%s: Hangup complete\n", ast_channel_name(ast));
-
-	restart_monitor();
-	ast_mutex_unlock(&p->lock);
-	return 0;
-}
-
-static int vpb_answer(struct ast_channel *ast)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast);
-/*
-	VPB_EVENT je;
-	int ret;
-	ast_verb(4, "%s: LOCKING in answer \n", p->dev);
-	ast_verb(4, "%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
-*/
-	ast_mutex_lock(&p->lock);
-
-	ast_verb(4, "%s: Answering channel\n", p->dev);
-
-	if (p->mode == MODE_FXO) {
-		ast_verb(4, "%s: Disabling Loop Drop detection\n", p->dev);
-		vpb_disable_event(p->handle, VPB_MDROP);
-	}
-
-	if (ast_channel_state(ast) != AST_STATE_UP) {
-		if (p->mode == MODE_FXO) {
-			vpb_sethook_sync(p->handle, VPB_OFFHOOK);
-			p->state = VPB_STATE_OFFHOOK;
-/*			vpb_sleep(500);
-			ret = vpb_get_event_ch_async(p->handle, &je);
-			if ((ret == VPB_OK) && ((je.type != VPB_DROP)&&(je.type != VPB_RING))){
-				ast_verb(4, "%s: Answer collected a wrong event!!\n", p->dev);
-				vpb_put_event(&je);
-			}
-*/
-		}
-		ast_setstate(ast, AST_STATE_UP);
-
-		ast_verb(2, "%s: Answered call on %s [%s]\n", p->dev,
-					 ast_channel_name(ast), (p->mode == MODE_FXO) ? "FXO" : "FXS");
-
-		ast_channel_rings_set(ast, 0);
-		if (!p->readthread) {
-	/*		res = ast_mutex_unlock(&p->lock); */
-	/*		ast_verbose("%s: unLOCKING in answer [%d]\n", p->dev,res); */
-			ast_pthread_create(&p->readthread, NULL, do_chanreads, (void *)p);
-		} else {
-			ast_verb(4, "%s: Record thread already running!!\n", p->dev);
-		}
-	} else {
-		ast_verb(4, "%s: Answered state is up\n", p->dev);
-	/*	res = ast_mutex_unlock(&p->lock); */
-	/*	ast_verbose("%s: unLOCKING in answer [%d]\n", p->dev,res); */
-	}
-	vpb_sleep(500);
-	if (p->mode == MODE_FXO) {
-		ast_verb(4, "%s: Re-enabling Loop Drop detection\n", p->dev);
-		vpb_enable_event(p->handle, VPB_MDROP);
-	}
-	ast_mutex_unlock(&p->lock);
-	return 0;
-}
-
-static struct ast_frame *vpb_read(struct ast_channel *ast)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast);
-	static struct ast_frame f = { AST_FRAME_NULL };
-
-	f.src = "vpb";
-	ast_log(LOG_NOTICE, "%s: vpb_read: should never be called!\n", p->dev);
-	ast_verbose("%s: vpb_read: should never be called!\n", p->dev);
-
-	return &f;
-}
-
-static inline AudioCompress ast2vpbformat(struct ast_format *format)
-{
-	if (ast_format_cmp(format, ast_format_alaw) == AST_FORMAT_CMP_EQUAL) {
-		return VPB_ALAW;
-	} else if (ast_format_cmp(format, ast_format_slin) == AST_FORMAT_CMP_EQUAL) {
-		return VPB_LINEAR;
-	} else if (ast_format_cmp(format, ast_format_ulaw) == AST_FORMAT_CMP_EQUAL) {
-		return VPB_MULAW;
-	} else if (ast_format_cmp(format, ast_format_adpcm) == AST_FORMAT_CMP_EQUAL) {
-		return VPB_OKIADPCM;
-	} else {
-		return VPB_RAW;
-	}
-}
-
-static inline const char * ast2vpbformatname(struct ast_format *format)
-{
-	if (ast_format_cmp(format, ast_format_alaw) == AST_FORMAT_CMP_EQUAL) {
-		return "AST_FORMAT_ALAW:VPB_ALAW";
-	} else if (ast_format_cmp(format, ast_format_slin) == AST_FORMAT_CMP_EQUAL) {
-		return "AST_FORMAT_SLINEAR:VPB_LINEAR";
-	} else if (ast_format_cmp(format, ast_format_ulaw) == AST_FORMAT_CMP_EQUAL) {
-		return "AST_FORMAT_ULAW:VPB_MULAW";
-	} else if (ast_format_cmp(format, ast_format_adpcm) == AST_FORMAT_CMP_EQUAL) {
-		return "AST_FORMAT_ADPCM:VPB_OKIADPCM";
-	} else {
-		return "UNKN:UNKN";
-	}
-}
-
-static inline int astformatbits(struct ast_format *format)
-{
-	if (ast_format_cmp(format, ast_format_slin) == AST_FORMAT_CMP_EQUAL) {
-		return 16;
-	} else if (ast_format_cmp(format, ast_format_adpcm) == AST_FORMAT_CMP_EQUAL) {
-		return 4;
-	} else {
-		return 8;
-	}
-}
-
-int a_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;
-}
-
-/* Writes a frame of voice data to a VPB channel */
-static int vpb_write(struct ast_channel *ast, struct ast_frame *frame)
-{
-	struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast);
-	int res = 0;
-	AudioCompress fmt = VPB_RAW;
-	struct timeval play_buf_time_start;
-	int tdiff;
-
-/*	ast_mutex_lock(&p->lock); */
-	ast_verb(6, "%s: vpb_write: Writing to channel\n", p->dev);
-
-	if (frame->frametype != AST_FRAME_VOICE) {
-		ast_verb(4, "%s: vpb_write: Don't know how to handle from type %d\n", ast_channel_name(ast), frame->frametype);
-/*		ast_mutex_unlock(&p->lock); */
-		return 0;
-	} else if (ast_channel_state(ast) != AST_STATE_UP) {
-		ast_verb(4, "%s: vpb_write: Attempt to Write frame type[%d]subclass[%s] on not up chan(state[%d])\n",
-			ast_channel_name(ast), frame->frametype, ast_format_get_name(frame->subclass.format), ast_channel_state(ast));
-		p->lastoutput = -1;
-/*		ast_mutex_unlock(&p->lock); */
-		return 0;
-	}
-/*	ast_debug(1, "%s: vpb_write: Checked frame type..\n", p->dev); */
-
-
-	fmt = ast2vpbformat(frame->subclass.format);
-	if (fmt < 0) {
-		ast_log(LOG_WARNING, "%s: vpb_write: Cannot handle frames of %s format!\n", ast_channel_name(ast),
-			ast_format_get_name(frame->subclass.format));
-		return -1;
-	}
-
-	tdiff = ast_tvdiff_ms(ast_tvnow(), p->lastplay);
-	ast_debug(1, "%s: vpb_write: time since last play(%d) \n", p->dev, tdiff);
-	if (tdiff < (VPB_SAMPLES / 8 - 1)) {
-		ast_debug(1, "%s: vpb_write: Asked to play too often (%d) (%d)\n", p->dev, tdiff, frame->datalen);
-/*		return 0; */
-	}
-	p->lastplay = ast_tvnow();
-/*
-	ast_debug(1, "%s: vpb_write: Checked frame format..\n", p->dev);
-*/
-
-	ast_mutex_lock(&p->play_lock);
-
-/*
-	ast_debug(1, "%s: vpb_write: Got play lock..\n", p->dev);
-*/
-
-	/* Check if we have set up the play_buf */
-	if (p->lastoutput == -1) {
-		vpb_play_buf_start(p->handle, fmt);
-		ast_verb(2, "%s: vpb_write: Starting play mode (codec=%d)[%s]\n", p->dev, fmt, ast2vpbformatname(frame->subclass.format));
-		p->lastoutput = fmt;
-		ast_mutex_unlock(&p->play_lock);
-		return 0;
-	} else if (p->lastoutput != fmt) {
-		vpb_play_buf_finish(p->handle);
-		vpb_play_buf_start(p->handle, fmt);
-		ast_verb(2, "%s: vpb_write: Changed play format (%d=>%d)\n", p->dev, p->lastoutput, fmt);
-		ast_mutex_unlock(&p->play_lock);
-		return 0;
-	}
-	p->lastoutput = fmt;
-
-
-
-	/* Apply extra gain ! */
-	if( p->txswgain > MAX_VPB_GAIN )
-		a_gain_vector(p->txswgain - MAX_VPB_GAIN , (short*)frame->data.ptr, frame->datalen / sizeof(short));
-
-/*	ast_debug(1, "%s: vpb_write: Applied gain..\n", p->dev); */
-/*	ast_debug(1, "%s: vpb_write: play_buf_time %d\n", p->dev, p->play_buf_time); */
-
-	if ((p->read_state == 1) && (p->play_buf_time < 5)){
-		play_buf_time_start = ast_tvnow();
-/*		res = vpb_play_buf_sync(p->handle, (char *)frame->data, tdiff * 8 * 2); */
-		res = vpb_play_buf_sync(p->handle, (char *)frame->data.ptr, frame->datalen);
-		if(res == VPB_OK) {
-			short * data = (short*)frame->data.ptr;
-			ast_verb(6, "%s: vpb_write: Wrote chan (codec=%d) %d %d\n", p->dev, fmt, data[0], data[1]);
-		}
-		p->play_buf_time = ast_tvdiff_ms(ast_tvnow(), play_buf_time_start);
-	} else {
-		p->chuck_count++;
-		ast_debug(1, "%s: vpb_write: Tossed data away, tooooo much data!![%d]\n", p->dev, p->chuck_count);
-		p->play_buf_time = 0;
-	}
-
-	ast_mutex_unlock(&p->play_lock);
-/*	ast_mutex_unlock(&p->lock); */
-	ast_verb(6, "%s: vpb_write: Done Writing to channel\n", p->dev);
-	return 0;
-}
-
-/* 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;
-	struct ast_format *tmpfmt;
-	int readlen, res, trycnt=0;
-	AudioCompress fmt;
-	int ignore_dtmf;
-	const char * getdtmf_var = NULL;
-
-	fr->frametype = AST_FRAME_VOICE;
-	fr->src = "vpb";
-	fr->mallocd = 0;
-	fr->delivery.tv_sec = 0;
-	fr->delivery.tv_usec = 0;
-	fr->samples = VPB_SAMPLES;
-	fr->offset = AST_FRIENDLY_OFFSET;
-	memset(p->buf, 0, sizeof p->buf);
-
-	ast_verb(3, "%s: chanreads: starting thread\n", p->dev);
-	ast_mutex_lock(&p->record_lock);
-
-	p->stopreads = 0;
-	p->read_state = 1;
-	while (!p->stopreads && p->owner) {
-
-		ast_verb(5, "%s: chanreads: Starting cycle ...\n", p->dev);
-		ast_verb(5, "%s: chanreads: Checking bridge \n", p->dev);
-		if (p->bridge) {
-			bridgerec = 0;
-		} else {
-			bridgerec = ast_channel_is_bridged(p->owner) ? 1 : 0;
-		}
-
-/*		if ((p->owner->_state != AST_STATE_UP) || !bridgerec) */
-		if ((ast_channel_state(p->owner) != AST_STATE_UP)) {
-			if (ast_channel_state(p->owner) != AST_STATE_UP) {
-				ast_verb(5, "%s: chanreads: Im not up[%d]\n", p->dev, ast_channel_state(p->owner));
-			} else {
-				ast_verb(5, "%s: chanreads: No bridgerec[%d]\n", p->dev, 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) && (!use_ast_dtmfdet)){
-			ast_verb(2, "%s:Now %s DTMF \n",
-					p->dev, ignore_dtmf ? "ignoring" : "listening for");
-			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_verb(6, "%s: chanreads: Checking dtmf's \n", p->dev);
-		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 );
-			}
-			if (p->bridge == NULL) {
-				vpb_dial_sync(p->handle, p->play_dtmf);
-				ast_verb(2, "%s: chanreads: Played DTMF %s\n", p->dev, p->play_dtmf);
-			} else {
-				ast_verb(2, "%s: chanreads: Not playing DTMF frame on native bridge\n", p->dev);
-			}
-			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);
-
-		if (p->owner) {
-			tmpfmt = ast_channel_rawreadformat(p->owner);
-		} else {
-			tmpfmt = ast_format_slin;
-		}
-		fmt = ast2vpbformat(tmpfmt);
-		if (fmt < 0) {
-			ast_log(LOG_WARNING, "%s: Record failure (unsupported format %s)\n", p->dev, ast_format_get_name(tmpfmt));
-			return NULL;
-		}
-		readlen = VPB_SAMPLES * astformatbits(tmpfmt) / 8;
-
-		if (p->lastinput == -1) {
-			vpb_record_buf_start(p->handle, fmt);
-/*			vpb_reset_record_fifo_alarm(p->handle); */
-			p->lastinput = fmt;
-			ast_verb(2, "%s: Starting record mode (codec=%d)[%s]\n", p->dev, fmt, ast2vpbformatname(tmpfmt));
-			continue;
-		} else if (p->lastinput != fmt) {
-			vpb_record_buf_finish(p->handle);
-			vpb_record_buf_start(p->handle, fmt);
-			p->lastinput = fmt;
-			ast_verb(2, "%s: Changed record format (%d=>%d)\n", p->dev, p->lastinput, fmt);
-			continue;
-		}
-
-		/* Read only if up and not bridged, or a bridge for which we can read. */
-		ast_verb(6, "%s: chanreads: getting buffer!\n", p->dev);
-		if( (res = vpb_record_buf_sync(p->handle, readbuf, readlen) ) == VPB_OK ) {
-			ast_verb(6, "%s: chanreads: got buffer!\n", p->dev);
-			/* Apply extra gain ! */
-			if( p->rxswgain > MAX_VPB_GAIN )
-				a_gain_vector(p->rxswgain - MAX_VPB_GAIN, (short *)readbuf, readlen / sizeof(short));
-			ast_verb(6, "%s: chanreads: applied gain\n", p->dev);
-
-			fr->subclass.format = tmpfmt;
-			fr->data.ptr = readbuf;
-			fr->datalen = readlen;
-			fr->frametype = AST_FRAME_VOICE;
-
-			if ((use_ast_dtmfdet) && (p->vad)) {
-				fr = ast_dsp_process(p->owner, p->vad, fr);
-				if (fr && (fr->frametype == AST_FRAME_DTMF)) {
-					ast_debug(1, "%s: chanreads: Detected DTMF '%c'\n", p->dev, fr->subclass.integer);
-				} else if (fr->subclass.integer == 'f') {
-				}
-			}
-			/* Using trylock here to prevent deadlock when channel is hungup
-			 * (ast_hangup() immediately gets lock)
-			 */
-			if (p->owner && !p->stopreads) {
-				ast_verb(6, "%s: chanreads: queueing buffer on read frame q (state[%d])\n", p->dev, ast_channel_state(p->owner));
-				do {
-					res = ast_channel_trylock(p->owner);
-					trycnt++;
-				} while ((res !=0 ) && (trycnt < 300));
-				if (res == 0) {
-					ast_queue_frame(p->owner, fr);
-					ast_channel_unlock(p->owner);
-				} else {
-					ast_verb(5, "%s: chanreads: Couldnt get lock after %d tries!\n", p->dev, trycnt);
-				}
-				trycnt = 0;
-
-/*
-				res = ast_mutex_trylock(&p->owner->lock);
-				if (res == 0)  {
-					ast_queue_frame(p->owner, fr);
-					ast_mutex_unlock(&p->owner->lock);
-				} else {
-					if (res == EINVAL)
-						ast_verb(5, "%s: chanreads: try owner->lock gave me EINVAL[%d]\n", p->dev, res);
-					else if (res == EBUSY)
-						ast_verb(5, "%s: chanreads: try owner->lock gave me EBUSY[%d]\n", p->dev, res);
-					while (res != 0) {
-					res = ast_mutex_trylock(&p->owner->lock);
-					}
-					if (res == 0) {
-						ast_queue_frame(p->owner, fr);
-						ast_mutex_unlock(&p->owner->lock);
-					} else {
-						if (res == EINVAL) {
-							ast_verb(5, "%s: chanreads: try owner->lock gave me EINVAL[%d]\n", p->dev, res);
-						} else if (res == EBUSY) {
-							ast_verb(5, "%s: chanreads: try owner->lock gave me EBUSY[%d]\n", p->dev, res);
-						}
-						ast_verb(5, "%s: chanreads: Couldnt get lock on owner[%s][%d][%d] channel to send frame!\n", p->dev, p->owner->name, (int)p->owner->lock.__m_owner, (int)p->owner->lock.__m_count);
-					}
-				}
-*/
-					short *data = (short *)readbuf;
-				ast_verb(7, "%s: Read channel (codec=%d) %d %d\n", p->dev, fmt, data[0], data[1]);
-			} else {
-				ast_verb(5, "%s: p->stopreads[%d] p->owner[%p]\n", p->dev, p->stopreads, (void *)p->owner);
-			}
-		}
-		ast_verb(5, "%s: chanreads: Finished cycle...\n", p->dev);
-	}
-	p->read_state = 0;
-
-	/* When stopreads seen, go away! */
-	vpb_record_buf_finish(p->handle);
-	p->read_state = 0;
-	ast_mutex_unlock(&p->record_lock);
-
-	ast_verb(2, "%s: Ending record mode (%d/%s)\n",
-			 p->dev, p->stopreads, p->owner ? "yes" : "no");
-	return NULL;
-}
-
-static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state state, const char *context, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor)
-{
-	struct ast_channel *tmp;
-	char cid_num[256];
-	char cid_name[256];
-
-	if (me->owner) {
-	    ast_log(LOG_WARNING, "Called vpb_new on owned channel (%s) ?!\n", me->dev);
-	    return NULL;
-	}
-	ast_verb(4, "%s: New call for context [%s]\n", me->dev, context);
-
-	tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, assignedids, requestor, AST_AMA_NONE, "%s", me->dev);
-	if (tmp) {
-		if (use_ast_ind == 1){
-			ast_channel_tech_set(tmp, &vpb_tech_indicate);
-		} else {
-			ast_channel_tech_set(tmp, &vpb_tech);
-		}
-
-		ast_channel_callgroup_set(tmp, me->callgroup);
-		ast_channel_pickupgroup_set(tmp, me->pickupgroup);
-
-		/* 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.
-		 */
-		ast_channel_nativeformats_set(tmp, vpb_tech.capabilities);
-		ast_channel_set_rawreadformat(tmp, ast_format_slin);
-		ast_channel_set_rawwriteformat(tmp, ast_format_slin);
-		if (state == AST_STATE_RING) {
-			ast_channel_rings_set(tmp, 1);
-			cid_name[0] = '\0';
-			cid_num[0] = '\0';
-			ast_callerid_split(me->callerid, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num));
-			ast_set_callerid(tmp, cid_num, cid_name, cid_num);
-		}
-		ast_channel_tech_pvt_set(tmp, me);
-
-		ast_channel_context_set(tmp, context);
-		if (!ast_strlen_zero(me->ext))
-			ast_channel_exten_set(tmp, me->ext);
-		else
-			ast_channel_exten_set(tmp, "s");
-		if (!ast_strlen_zero(me->language))
-			ast_channel_language_set(tmp, me->language);
-		ast_channel_unlock(tmp);
-
-		me->owner = tmp;
-
-		me->bridge = NULL;
-		me->lastoutput = -1;
-		me->lastinput = -1;
-		me->last_ignore_dtmf = 1;
-		me->readthread = 0;
-		me->play_dtmf[0] = '\0';
-		me->faxhandled = 0;
-
-		me->lastgrunt = ast_tvnow(); /* Assume at least one grunt tone seen now. */
-		me->lastplay = ast_tvnow(); /* Assume at least one grunt tone seen now. */
-
-		if (state != AST_STATE_DOWN) {
-			if ((me->mode != MODE_FXO) && (state != AST_STATE_UP)) {
-				vpb_answer(tmp);
-			}
-			if (ast_pbx_start(tmp)) {
-				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp));
-				ast_hangup(tmp);
-		   	}
-		}
-	} else {
-		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
-	}
-	return tmp;
-}
-
-static struct ast_channel *vpb_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause)
-{
-	struct vpb_pvt *p;
-	struct ast_channel *tmp = NULL;
-	char *sepstr, *name;
-	const char *s;
-	int group = -1;
-
-	if (!(ast_format_cap_iscompatible_format(cap, ast_format_slin))) {
-		struct ast_str *buf;
-
-		buf = ast_str_create(AST_FORMAT_CAP_NAMES_LEN);
-		if (!buf) {
-			return NULL;
-		}
-		ast_log(LOG_NOTICE, "Asked to create a channel for unsupported formats: %s\n",
-			ast_format_cap_get_names(cap, &buf));
-		ast_free(buf);
-		return NULL;
-	}
-
-	name = ast_strdup(S_OR(data, ""));
-
-	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);
-	for (p = iflist; p; p = p->next) {
-		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, assignedids, requestor);
-					break;
-				}
-			}
-		} else {
-			if ((p->group == group) && (!p->owner)) {
-				tmp = vpb_new(p, AST_STATE_DOWN, p->context, assignedids, requestor);
-				break;
-			}
-		}
-	}
-	ast_mutex_unlock(&iflock);
-
-
-	ast_verb(2, " %s requested, got: [%s]\n", name, tmp ? ast_channel_name(tmp) : "None");
-
-	ast_free(name);
-
-	restart_monitor();
-	return tmp;
-}
-
-static float parse_gain_value(const char *gain_type, const char *value)
-{
-	float gain;
-
-	/* 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);
-		return DEFAULT_GAIN;
-	}
-
-
-	/* percentage? */
-	/*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 */
-	if (use_ast_ind == 1){
-		ast_channel_unregister(&vpb_tech_indicate);
-	} else {
-		ast_channel_unregister(&vpb_tech);
-	}
-
-	ast_mutex_lock(&iflock);
-	/* Hangup all interfaces if they have an owner */
-	for (p = iflist; p; p = p->next) {
-		if (p->owner)
-			ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD);
-	}
-	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->owner_lock);
-		ast_mutex_destroy(&p->record_lock);
-		ast_mutex_destroy(&p->play_lock);
-		ast_mutex_destroy(&p->play_dtmf_lock);
-		p->readthread = 0;
-
-		vpb_close(p->handle);
-
-		iflist = iflist->next;
-
-		ast_free(p);
-	}
-	iflist = NULL;
-	ast_mutex_unlock(&iflock);
-
-	if (bridges) {
-		ast_mutex_lock(&bridge_lock);
-		for (int i = 0; i < max_bridges; i++) {
-			ast_mutex_destroy(&bridges[i].lock);
-			ast_cond_destroy(&bridges[i].cond);
-		}
-		ast_free(bridges);
-		bridges = NULL;
-		ast_mutex_unlock(&bridge_lock);
-	}
-
-	ao2_cleanup(vpb_tech.capabilities);
-	vpb_tech.capabilities = NULL;
-	ao2_cleanup(vpb_tech_indicate.capabilities);
-	vpb_tech_indicate.capabilities = NULL;
-	return 0;
-}
-
-/*!
- * \brief Load the module
- *
- * Module loading including tests for configuration or dependencies.
- * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
- * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
- * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
- * configuration file or other non-critical problem return
- * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
- */
-static enum ast_module_load_result load_module()
-{
-	struct ast_config *cfg;
-	struct ast_variable *v;
-	struct ast_flags config_flags = { 0 };
-	struct vpb_pvt *tmp;
-	int board = 0, group = 0;
-	ast_group_t	callgroup = 0;
-	ast_group_t	pickupgroup = 0;
-	int mode = MODE_IMMEDIATE;
-	float txgain = DEFAULT_GAIN, rxgain = DEFAULT_GAIN;
-	float txswgain = 0, rxswgain = 0;
-	int got_gain=0;
-	int first_channel = 1;
-	int echo_cancel = DEFAULT_ECHO_CANCEL;
-	enum ast_module_load_result error = AST_MODULE_LOAD_SUCCESS; /* Error flag */
-	int bal1 = -1; /* Special value - means do not set */
-	int bal2 = -1;
-	int bal3 = -1;
-	char * callerid = NULL;
-	int num_cards = 0;
-
-	vpb_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-	if (!vpb_tech.capabilities) {
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	vpb_tech_indicate.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-	if (!vpb_tech_indicate.capabilities) {
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	ast_format_cap_append(vpb_tech.capabilities, ast_format_slin, 0);
-	ast_format_cap_append(vpb_tech_indicate.capabilities, ast_format_slin, 0);
-	try {
-		num_cards = vpb_get_num_cards();
-	} catch (std::exception&) {
-		ast_log(LOG_ERROR, "No Voicetronix cards detected\n");
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	int ports_per_card[num_cards];
-	for (int i = 0; i < num_cards; ++i)
-		ports_per_card[i] = vpb_get_ports_per_card(i);
-
-	cfg = ast_config_load(config, config_flags);
-
-	/* We *must* have a config file otherwise stop immediately */
-	if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) {
-		ast_log(LOG_ERROR, "Unable to load config %s\n", config);
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	ast_mutex_lock(&iflock);
-	v = ast_variable_browse(cfg, "general");
-	while (v){
-		if (strcasecmp(v->name, "cards") == 0) {
-			ast_log(LOG_NOTICE, "VPB Driver configured to use [%d] cards\n", atoi(v->value));
-		} else if (strcasecmp(v->name, "indication") == 0) {
-			use_ast_ind = 1;
-			ast_log(LOG_NOTICE, "VPB driver using Asterisk Indication functions!\n");
-		} else if (strcasecmp(v->name, "break-for-dtmf") == 0) {
-			if (ast_true(v->value)) {
-				break_for_dtmf = 1;
-			} else {
-				break_for_dtmf = 0;
-				ast_log(LOG_NOTICE, "VPB driver not stopping for DTMF's in native bridge\n");
-			}
-		} else if (strcasecmp(v->name, "ast-dtmf") == 0) {
-			use_ast_dtmf = 1;
-			ast_log(LOG_NOTICE, "VPB driver using Asterisk DTMF play functions!\n");
-		} else if (strcasecmp(v->name, "ast-dtmf-det") == 0) {
-			use_ast_dtmfdet = 1;
-			ast_log(LOG_NOTICE, "VPB driver using Asterisk DTMF detection functions!\n");
-		} else if (strcasecmp(v->name, "relaxdtmf") == 0) {
-			relaxdtmf = 1;
-			ast_log(LOG_NOTICE, "VPB driver using Relaxed DTMF with Asterisk DTMF detections functions!\n");
-		} else if (strcasecmp(v->name, "timer_period_ring") == 0) {
-			timer_period_ring = atoi(v->value);
-		} else if (strcasecmp(v->name, "ecsuppthres") == 0) {
-			ec_supp_threshold = (short)atoi(v->value);
-		} else if (strcasecmp(v->name, "dtmfidd") == 0) {
-			dtmf_idd = atoi(v->value);
-			ast_log(LOG_NOTICE, "VPB Driver setting DTMF IDD to [%d]ms\n", dtmf_idd);
-		}
-		v = v->next;
-	}
-
-	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, "callgroup") == 0) {
-			callgroup = ast_get_group(v->value);
-		} else if (strcasecmp(v->name, "pickupgroup") == 0) {
-			pickupgroup = ast_get_group(v->value);
-		} else if (strcasecmp(v->name, "usepolaritycid") == 0) {
-			UsePolarityCID = atoi(v->value);
-		} else if (strcasecmp(v->name, "useloopdrop") == 0) {
-			UseLoopDrop = atoi(v->value);
-		} else if (strcasecmp(v->name, "usenativebridge") == 0) {
-			UseNativeBridge = atoi(v->value);
-		} else if (strcasecmp(v->name, "channel") == 0) {
-			int channel = atoi(v->value);
-			if (board >= num_cards || board < 0 || channel < 0 || channel >= ports_per_card[board]) {
-				ast_log(LOG_ERROR, "Invalid board/channel (%d/%d) for channel '%s'\n", board, channel, v->value);
-				error = AST_MODULE_LOAD_FAILURE;
-				goto done;
-			}
-			tmp = mkif(board, channel, mode, got_gain, txgain, rxgain, txswgain, rxswgain, bal1, bal2, bal3, callerid, echo_cancel,group,callgroup,pickupgroup);
-			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 = AST_MODULE_LOAD_FAILURE;
-				goto done;
-			}
-		} else if (strcasecmp(v->name, "language") == 0) {
-			ast_copy_string(language, v->value, sizeof(language));
-		} else if (strcasecmp(v->name, "callerid") == 0) {
-			callerid = ast_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")) {
-			ast_copy_string(context, v->value, sizeof(context));
-		} 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);
-			got_gain |= VPB_GOT_TXSWG;
-		} else if (strcasecmp(v->name, "rxgain") == 0) {
-			rxswgain = parse_gain_value(v->name, v->value);
-			got_gain |= VPB_GOT_RXSWG;
-		} else if (strcasecmp(v->name, "txhwgain") == 0) {
-			txgain = parse_gain_value(v->name, v->value);
-			got_gain |= VPB_GOT_TXHWG;
-		} else if (strcasecmp(v->name, "rxhwgain") == 0) {
-			rxgain = parse_gain_value(v->name, v->value);
-			got_gain |= VPB_GOT_RXHWG;
-		} 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_config_destroy(cfg);
-
-	if (use_ast_ind == 1) {
-		if (error == AST_MODULE_LOAD_SUCCESS && ast_channel_register(&vpb_tech_indicate) != 0) {
-			ast_log(LOG_ERROR, "Unable to register channel class 'vpb'\n");
-			error = AST_MODULE_LOAD_FAILURE;
-		} else {
-			ast_log(LOG_NOTICE, "VPB driver Registered (w/AstIndication)\n");
-		}
-	} else {
-		if (error == AST_MODULE_LOAD_SUCCESS && ast_channel_register(&vpb_tech) != 0) {
-			ast_log(LOG_ERROR, "Unable to register channel class 'vpb'\n");
-			error = AST_MODULE_LOAD_FAILURE;
-		} else {
-			ast_log(LOG_NOTICE, "VPB driver Registered )\n");
-		}
-	}
-
-
-	if (error != AST_MODULE_LOAD_SUCCESS)
-		unload_module();
-	else
-		restart_monitor(); /* And start the monitor for the first time */
-
-	return error;
-}
-
-/**/
-#if defined(__cplusplus) || defined(c_plusplus)
- }
-#endif
-/**/
-
-AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Voicetronix API driver");
diff --git a/configs/samples/vpb.conf.sample b/configs/samples/vpb.conf.sample
deleted file mode 100644
index bdc89df..0000000
--- a/configs/samples/vpb.conf.sample
+++ /dev/null
@@ -1,248 +0,0 @@
-;
-; Voicetronix Voice Processing Board (VPB) telephony interface
-;
-; Configuration file
-;
-
-[general]
-;
-; Total number of Voicetronix cards in this machine
-;
-cards=0
-
-;
-; Which indication functions to use
-;    1 = use Asterisk functions
-;    0 = use VPB functions
-;
-indication=1
-
-;
-; Echo Canceller suppression threshold
-;    0    = no suppression threshold
-;    2048 = -18dB
-;    4096 = -24dB
-;
-;ecsuppthres=0
-
-;
-; Inter-digit delay timeout, used when collecting DTMF tones for dialling
-; from a station port.  Measured in milliseconds.
-;
-dtmfidd=3000
-
-;
-; How to play DTMF tones
-;    any value     = use Asterisk functions
-;    commented out = use VPB functions
-;
-;ast-dtmf=1
-
-;
-; How to detect DTMF tones
-;    any value     = use Asterisk functions
-;    commented out = use VPB functions
-;
-; NOTE: this setting is currently broken, and uncommenting it will
-; stop dialling from working.  Any volunteers to fix it?
-;ast-dtmf-det=1
-
-;
-; Use relaxed DTMF detection (ignored unless ast-dtmf-det is set)
-;
-relaxdtmf=1
-
-;
-; When we do a native bridge between two VPB channels:
-;    yes = only break the connection for '#' and '*'
-;    no  = break the connection for any DTMF
-;
-; NOTE: this is currently broken, and setting to no will segfault
-; Asterisk while dialling.  Any volunteers to fix it?
-;
-break-for-dtmf=yes
-
-;
-; The maximum period between received rings.  Measures in milliseconds.
-;
-timer_period_ring=4000
-
-
-[interfaces]
-;
-; Default language
-;
-language=en
-
-;
-; Default context
-;
-context=public
-
-;
-; Echo cancellation
-;     off  = no not use echo cancellation
-;     on   = use echo cancellation
-;
-echocancel=off
-
-;
-; Caller ID routines/signalling
-;   For FXO ports, select one of:
-;     on   = collect caller ID between 1st/2nd rings using VPB routines
-;     off  = do not use caller ID
-;     bell = bell202 as used in US, using Asterisk's caller ID routines
-;     v23  = v23 as used in the UK, using Asterisk's caller ID routines
-;   For FXS ports, set the channel's CID in '"name" <number>' format
-;
-; NOTE that other caller ID standards are supported in Asterisk, but are
-; not yet active in chan_vpb.  It should be reasonably trivial to add
-; support for the other standards (see the default chan_dahdi.conf for a
-; list of them) that Asterisk already handles.
-;
-callerid=bell
-
-;
-; Use a polarity reversal as the trigger for the start of caller ID,
-; rather than triggering after the first ring.
-;
-usepolaritycid=0
-
-;
-; Use loop drop to detect the end of a call.  On by default, but if you
-; experience unexpected hangups, try turning it off.
-;
-useloopdrop=1
-
-;
-; Use in-kernel bridging.  This will generally give lower delay audio if
-; bridging between two VPB channels.  It will not affect bridging
-; between VPB channels and other technologies.
-;
-usenativebridge=1
-
-;
-; Software transmit and receive gain.  Adjusting these will change the
-; volume of audio files that are played (tx) and recorded (rx).  It will
-; _not_ affect audio between channels in a native bridge.  It will,
-; however, affect the volume of audio between VPB channels and channels
-; using other technologies (such as VoIP channels).  Usually it's best to
-; leave these as they are.  If you're looking to get rid of echo, the
-; first thing to do is match your line impedance with the bal1/bal2/bal3
-; settings.
-;
-;txgain=0.0
-;rxgain=0.0
-
-;
-; Hardware transmit and receive gain.  Adjusting these will change the
-; volume of all audio on a channel.  The allowed range of settings is
-; -12.0 to 12.0 (measured in dB).
-;
-;txhwgain=0.0
-;rxhwgain=0.0
-
-;
-; Balance register settings, for matching the impedance of the card to
-; that of the connected equipment.  Only relevant for OpenLine and
-; OpenSwitch series cards.  Values should be in the range 0 - 255.
-;
-; We (Voicetronix) have determined the best codec balance values for
-; standard interfaces based on their US, Australian and European
-; specifications, shown below.
-;
-; US (600 ohm)
-;bal1=0xf8
-;bal2=0x1a
-;bal3=0x0c
-;
-; Australia (complex impedance)
-;bal1=0xf0
-;bal2=0x5d
-;bal3=0x79
-;
-; Europe (CTR-21)
-;bal1=0xf0
-;bal2=0x6e
-;bal3=0x75
-
-;
-; Logical groups can be assigned to allow outgoing rollover.  Groups range
-; from 0 to 63, and multiple groups can be specified.
-;
-group=1
-
-;
-; Ring groups (a.k.a. call groups) and pickup groups.  If a phone is
-; ringing and it is a member of a group which is one of your pickup
-; groups, then you can answer it by picking up and dialling *8#.  For
-; simple offices, just make these both the same.  Groups range from 0 to
-; 63.
-;
-callgroup=1
-pickupgroup=1
-
-;
-; If we haven't had a "grunt" (voice activity detection) for this many
-; seconds, then we hang up the line due to inactivity.  Default is one
-; hour.
-;
-grunttimeout=3600
-
-;
-; Type of line and line handling.  This setting will usually be overridden
-; on a per channel basis.  Valid settings are:
-;     fxo       = this is an FXO port
-;     immediate = this is an FXS port, with no dialtone or dialling
-;                   required (ie it is a "hotline")
-;     dialtone  = this is an FXS port, providing dialtone and dialling
-;
-mode=immediate
-
-; ------------------------------------------------------------------------
-; Channel definitions
-;
-; Each channel inherits the settings specified above, unless the are
-; overridden.  As a minimum, the board number and channel number must be
-; set, starting from 0 for the first board, and for the channels on each
-; board.  For example, board 0, channels 0 to 11, then board 1, channels
-; 0 to 11 for two OpenSwitch12 cards.
-;
-
-;
-; First board is an OpenSwitch12 card (jumpers at factory defaults)
-;
-;board=0
-;
-;mode=dialtone
-;context=from-handset
-;group=1
-;channel=0
-;channel=1
-;channel=2
-;channel=3
-;channel=4
-;channel=5
-;channel=6
-;channel=7
-;
-;mode=fxo
-;context=from-pstn
-;group=2
-;channel=8
-;channel=9
-;channel=10
-;channel=11
-
-;
-; Second board is an OpenLine4
-;
-;board=1
-;
-;mode=fxo
-;group=2
-;context=from-pstn
-;channel=0
-;channel=1
-;channel=2
-;channel=3
diff --git a/configure b/configure
index 5778a04..f6ca6ea 100755
--- a/configure
+++ b/configure
@@ -720,10 +720,6 @@
 X11_DIR
 X11_INCLUDE
 X11_LIB
-PBX_VPB
-VPB_DIR
-VPB_INCLUDE
-VPB_LIB
 PBX_VORBIS
 VORBIS_DIR
 VORBIS_INCLUDE
@@ -1426,7 +1422,6 @@
 with_unbound
 with_unixodbc
 with_vorbis
-with_vpb
 with_x11
 with_z
 enable_xmldoc
@@ -2196,7 +2191,6 @@
   --with-unbound=PATH     use unbound files in PATH
   --with-unixodbc=PATH    use unixODBC files in PATH
   --with-vorbis=PATH      use Vorbis files in PATH
-  --with-vpb=PATH         use Voicetronix API files in PATH
   --with-x11=PATH         use X11 files in PATH
   --with-z=PATH           use zlib compression files in PATH
 
@@ -3057,52 +3051,6 @@
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -12491,38 +12439,6 @@
 
 
 
-    VPB_DESCRIP="Voicetronix API"
-    VPB_OPTION="vpb"
-    PBX_VPB=0
-
-# Check whether --with-vpb was given.
-if test "${with_vpb+set}" = set; then :
-  withval=$with_vpb;
-	case ${withval} in
-	n|no)
-	USE_VPB=no
-	# -1 is a magic value used by menuselect to know that the package
-	# was disabled, other than 'not found'
-	PBX_VPB=-1
-	;;
-	y|ye|yes)
-	ac_mandatory_list="${ac_mandatory_list} VPB"
-	;;
-	*)
-	VPB_DIR="${withval}"
-	ac_mandatory_list="${ac_mandatory_list} VPB"
-	;;
-	esac
-
-fi
-
-
-
-
-
-
-
-
     X11_DESCRIP="X11"
     X11_OPTION="x11"
     PBX_X11=0
@@ -32358,79 +32274,6 @@
     fi
 
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-if test "${USE_VPB}" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpb_open in -lvpb" >&5
-$as_echo_n "checking for vpb_open in -lvpb... " >&6; }
-   saved_libs="${LIBS}"
-   saved_cppflags="${CPPFLAGS}"
-   if test "x${VPB_DIR}" != "x"; then
-      if test -d ${VPB_DIR}/lib; then
-         vpblibdir=${VPB_DIR}/lib
-      else
-         vpblibdir=${VPB_DIR}
-      fi
-      LIBS="${LIBS} -L${vpblibdir}"
-      CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
-   fi
-   LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
-   CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#include <vpbapi.h>
-int
-main ()
-{
-int q = vpb_open(0,0);
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		ac_cv_lib_vpb_vpb_open="yes"
-
-else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		ac_cv_lib_vpb_vpb_open="no"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-   LIBS="${saved_libs}"
-   CPPFLAGS="${saved_cppflags}"
-   if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
-	VPB_LIB="-lvpb"
-	if test "${VPB_DIR}" != ""; then
-	   VPB_LIB="-L${vpblibdir}  ${VPB_LIB}"
-	   VPB_INCLUDE="-I${VPB_DIR}/include"
-	fi
-	PBX_VPB=1
-
-$as_echo "#define HAVE_VPB 1" >>confdefs.h
-
-   fi
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
 
 if test "x${PBX_ZLIB}" != "x1" -a "${USE_ZLIB}" != "no"; then
    pbxlibdir=""
diff --git a/configure.ac b/configure.ac
index 2ae410e..13e1c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,7 +598,6 @@
 AST_EXT_LIB_SETUP([UNBOUND], [unbound], [unbound])
 AST_EXT_LIB_SETUP([UNIXODBC], [unixODBC], [unixodbc])
 AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis])
-AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
 AST_EXT_LIB_SETUP([X11], [X11], [x11])
 AST_EXT_LIB_SETUP([ZLIB], [zlib compression], [z])
 
@@ -2715,51 +2714,6 @@
 AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -lvorbisfile])
 AST_C_DECLARE_CHECK([VORBIS_OPEN_CALLBACKS], [OV_CALLBACKS_NOCLOSE], [vorbis/vorbisfile.h])
 
-AC_LANG_PUSH(C++)
-
-if test "${USE_VPB}" != "no"; then
-   AC_MSG_CHECKING(for vpb_open in -lvpb)
-   saved_libs="${LIBS}"
-   saved_cppflags="${CPPFLAGS}"
-   if test "x${VPB_DIR}" != "x"; then
-      if test -d ${VPB_DIR}/lib; then
-         vpblibdir=${VPB_DIR}/lib
-      else
-         vpblibdir=${VPB_DIR}
-      fi
-      LIBS="${LIBS} -L${vpblibdir}"
-      CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
-   fi
-   LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
-   CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
-   AC_LINK_IFELSE(
-	[
-	AC_LANG_PROGRAM(
-	[#include <vpbapi.h>],
-	[int q = vpb_open(0,0);])
-	],
-	[	AC_MSG_RESULT(yes)
-		ac_cv_lib_vpb_vpb_open="yes"
-	],
-	[	AC_MSG_RESULT(no)
-		ac_cv_lib_vpb_vpb_open="no"
-	]
-	)
-   LIBS="${saved_libs}"
-   CPPFLAGS="${saved_cppflags}"
-   if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
-	VPB_LIB="-lvpb"
-	if test "${VPB_DIR}" != ""; then
-	   VPB_LIB="-L${vpblibdir}  ${VPB_LIB}"
-	   VPB_INCLUDE="-I${VPB_DIR}/include"
-	fi
-	PBX_VPB=1
-	AC_DEFINE([HAVE_VPB], 1, [Define if your system has the VoiceTronix API libraries.])
-   fi
-fi
-
-AC_LANG_POP
-
 AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h])
 
 if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then
diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index 3d9cbcc..b9c7321 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -25,7 +25,7 @@
 # Asterisk: for addons:
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev xmlstarlet bison flex"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libneon27-dev libgmime-2.6-dev libgmime-3.0-dev liblua5.2-dev liburiparser-dev libxslt1-dev libssl-dev"
-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libvpb-dev libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash libcap-dev"
+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash libcap-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-common-dev libcpg-dev libcfg-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample1-dev libc-client2007e-dev binutils-dev libsrtp0-dev libsrtp2-dev libgsm1-dev doxygen graphviz zlib1g-dev libldap2-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libcodec2-dev libfftw3-dev libsndfile1-dev libunbound-dev"
diff --git a/doc/UPGRADE-staging/chan_vpb_removal.txt b/doc/UPGRADE-staging/chan_vpb_removal.txt
new file mode 100644
index 0000000..17feb89
--- /dev/null
+++ b/doc/UPGRADE-staging/chan_vpb_removal.txt
@@ -0,0 +1,6 @@
+Subject: chan_vpb
+Master-Only: True
+
+This module was deprecated in Asterisk 16
+and is now being removed in accordance with
+the Asterisk Module Deprecation policy.
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index b9a6b66..e56f1c8 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -1239,9 +1239,6 @@
 /* Define if your system has OV_CALLBACKS_NOCLOSE declared. */
 #undef HAVE_VORBIS_OPEN_CALLBACKS
 
-/* Define if your system has the VoiceTronix API libraries. */
-#undef HAVE_VPB
-
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
diff --git a/include/asterisk/doxygen/licensing.h b/include/asterisk/doxygen/licensing.h
index 10e5e40..fa9e73e 100644
--- a/include/asterisk/doxygen/licensing.h
+++ b/include/asterisk/doxygen/licensing.h
@@ -134,7 +134,7 @@
  * \li libsqlite3.so.0
  * \li libss7.so.1
  * \li libssl.so.0.9.8 (chan_h323)
- * \li libstdc++.so (chan_h323, chan_vpb)
+ * \li libstdc++.so (chan_h323)
  * \li libsuppserv.so
  * \li libsybdb.so.5
  * \li libsysfs.so.2
@@ -144,7 +144,6 @@
  * \li libtonezone.so.1.0
  * \li libvorbis.so.0
  * \li libvorbisenc.so.2
- * \li libvpb.a (chan_vpb)
  * \li libwrap.so.0
  * \li libxcb-xlib.so.0
  * \li libxcb.so.1
diff --git a/makeopts.in b/makeopts.in
index a418752..c0ee5db 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -322,9 +322,6 @@
 VORBIS_INCLUDE=@VORBIS_INCLUDE@
 VORBIS_LIB=@VORBIS_LIB@
 
-VPB_INCLUDE=@VPB_INCLUDE@
-VPB_LIB=@VPB_LIB@
-
 HAVE_DAHDI=@PBX_DAHDI@
 DAHDI_INCLUDE=@DAHDI_INCLUDE@
 
diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh
index 1d280f0..52f762e 100755
--- a/tests/CI/buildAsterisk.sh
+++ b/tests/CI/buildAsterisk.sh
@@ -135,7 +135,7 @@
 	fi
 	runner menuselect/menuselect `gen_cats enable $cat_enables` menuselect.makeopts
 
-	mod_disables="res_digium_phone chan_vpb"
+	mod_disables="res_digium_phone"
 	if [ $TESTED_ONLY -eq 1 ] ; then
 		# These modules are not tested at all.  They are loaded but nothing is ever done
 		# with them, no testsuite tests depend on them.

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16322
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 19
Gerrit-Change-Id: I19bb39eed0257ddfef453eb2df5646d073d50fe1
Gerrit-Change-Number: 16322
Gerrit-PatchSet: 5
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Sean Bright <sean at seanbright.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210818/3cb608d6/attachment-0001.html>


More information about the asterisk-code-review mailing list