[Asterisk-code-review] chan_mgcp: Remove deprecated module. (asterisk[master])

Michael Bradeen asteriskteam at digium.com
Tue Nov 15 11:08:08 CST 2022


Michael Bradeen has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/19566 )


Change subject: chan_mgcp: Remove deprecated module.
......................................................................

chan_mgcp: Remove deprecated module.

Also removes res_pktcops to avoid merge conflicts
with ASTERISK~30301.

ASTERISK-30299

Change-Id: I41a316d327646a197b6f112f7f637aceb5111b41
---
M channels/Makefile
D channels/chan_mgcp.c
M configs/samples/cli_aliases.conf.sample
M configs/samples/extensions.ael.sample
M configs/samples/extensions.conf.sample
D configs/samples/mgcp.conf.sample
D configs/samples/res_pktccops.conf.sample
M configure
M configure.ac
A doc/UPGRADE-staging/chan_mgcp_removal.txt
M doc/asterisk.8
M doc/asterisk.sgml
M include/asterisk/doxyref.h
D include/asterisk/pktccops.h
M include/asterisk/res_hep.h
M main/asterisk.dynamics
M menuselect/example_menuselect-tree
D res/res_pktccops.c
D res/res_pktccops.exports.in
M tests/CI/buildAsterisk.sh
20 files changed, 27 insertions(+), 6,869 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/66/19566/1

diff --git a/channels/Makefile b/channels/Makefile
index 0af82d9..4cbed9c 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -31,7 +31,6 @@
 $(call MOD_ADD_C,chan_dahdi,$(wildcard dahdi/*.c) sig_analog.c sig_pri.c sig_ss7.c)
 
 chan_dahdi.o: _ASTCFLAGS+=$(call get_menuselect_cflags,LOTS_OF_SPANS)
-chan_mgcp.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
 chan_unistim.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
 chan_phone.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
 chan_sip.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
deleted file mode 100644
index b2f1e57..0000000
--- a/channels/chan_mgcp.c
+++ /dev/null
@@ -1,5009 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2006, Digium, Inc.
- *
- * Mark Spencer <markster at digium.com>
- *
- * 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 Implementation of Media Gateway Control Protocol
- *
- * \author Mark Spencer <markster at digium.com>
- *
- * \ingroup channel_drivers
- */
-
-/*! \li \ref chan_mgcp.c uses the configuration file \ref mgcp.conf
- * \addtogroup configuration_file
- */
-
-/*! \page mgcp.conf mgcp.conf
- * \verbinclude mgcp.conf.sample
- */
-
-/*** MODULEINFO
-        <use type="module">res_pktccops</use>
-	<defaultenabled>no</defaultenabled>
-	<support_level>deprecated</support_level>
-	<deprecated_in>19</deprecated_in>
-	<removed_in>21</removed_in>
- ***/
-
-#include "asterisk.h"
-
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <signal.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
-#include "asterisk/config.h"
-#include "asterisk/module.h"
-#include "asterisk/pickup.h"
-#include "asterisk/pbx.h"
-#include "asterisk/sched.h"
-#include "asterisk/io.h"
-#include "asterisk/rtp_engine.h"
-#include "asterisk/acl.h"
-#include "asterisk/callerid.h"
-#include "asterisk/cli.h"
-#include "asterisk/say.h"
-#include "asterisk/astdb.h"
-#include "asterisk/features.h"
-#include "asterisk/app.h"
-#include "asterisk/mwi.h"
-#include "asterisk/musiconhold.h"
-#include "asterisk/utils.h"
-#include "asterisk/netsock2.h"
-#include "asterisk/causes.h"
-#include "asterisk/dsp.h"
-#include "asterisk/devicestate.h"
-#include "asterisk/stringfields.h"
-#include "asterisk/abstract_jb.h"
-#include "asterisk/chanvars.h"
-#include "asterisk/pktccops.h"
-#include "asterisk/stasis.h"
-#include "asterisk/bridge.h"
-#include "asterisk/features_config.h"
-#include "asterisk/parking.h"
-#include "asterisk/stasis_channels.h"
-#include "asterisk/format_cache.h"
-
-/*
- * Define to work around buggy dlink MGCP phone firmware which
- * appears not to know that "rt" is part of the "G" package.
- */
-/* #define DLINK_BUGGY_FIRMWARE	*/
-
-#define MGCPDUMPER
-#define DEFAULT_EXPIRY	120
-#define MAX_EXPIRY	3600
-#define DIRECTMEDIA	1
-
-#ifndef INADDR_NONE
-#define INADDR_NONE (in_addr_t)(-1)
-#endif
-
-/*! Global jitterbuffer configuration - by default, jb is disabled
- *  \note Values shown here match the defaults shown in mgcp.conf.sample */
-static struct ast_jb_conf default_jbconf =
-{
-	.flags = 0,
-	.max_size = 200,
-	.resync_threshold = 1000,
-	.impl = "fixed",
-	.target_extra = 40,
-};
-static struct ast_jb_conf global_jbconf;
-
-static const char tdesc[] = "Media Gateway Control Protocol (MGCP)";
-static const char config[] = "mgcp.conf";
-
-#define MGCP_DTMF_RFC2833	(1 << 0)
-#define MGCP_DTMF_INBAND	(1 << 1)
-#define MGCP_DTMF_HYBRID	(1 << 2)
-
-#define DEFAULT_MGCP_GW_PORT	2427 /*!< From RFC 2705 */
-#define DEFAULT_MGCP_CA_PORT	2727 /*!< From RFC 2705 */
-#define MGCP_MAX_PACKET		1500 /*!< Also from RFC 2543, should sub headers tho */
-#define DEFAULT_RETRANS		1000 /*!< How frequently to retransmit */
-#define MAX_RETRANS		5    /*!< Try only 5 times for retransmissions */
-
-/*! MGCP rtp stream modes { */
-#define MGCP_CX_SENDONLY	0
-#define MGCP_CX_RECVONLY	1
-#define MGCP_CX_SENDRECV	2
-#define MGCP_CX_CONF		3
-#define MGCP_CX_CONFERENCE	3
-#define MGCP_CX_MUTE		4
-#define MGCP_CX_INACTIVE	4
-/*! } */
-
-static const char * const mgcp_cxmodes[] = {
-	"sendonly",
-	"recvonly",
-	"sendrecv",
-	"confrnce",
-	"inactive"
-};
-
-enum {
-	MGCP_CMD_EPCF,
-	MGCP_CMD_CRCX,
-	MGCP_CMD_MDCX,
-	MGCP_CMD_DLCX,
-	MGCP_CMD_RQNT,
-	MGCP_CMD_NTFY,
-	MGCP_CMD_AUEP,
-	MGCP_CMD_AUCX,
-	MGCP_CMD_RSIP
-};
-
-static char context[AST_MAX_EXTENSION] = "default";
-
-static char language[MAX_LANGUAGE] = "";
-static char musicclass[MAX_MUSICCLASS] = "";
-static char parkinglot[AST_MAX_CONTEXT];
-static char cid_num[AST_MAX_EXTENSION] = "";
-static char cid_name[AST_MAX_EXTENSION] = "";
-
-static int dtmfmode = 0;
-static int nat = 0;
-static int ncs = 0;
-static int pktcgatealloc = 0;
-static int hangupongateremove = 0;
-
-static ast_group_t cur_callergroup = 0;
-static ast_group_t cur_pickupgroup = 0;
-
-static struct {
-	unsigned int tos;
-	unsigned int tos_audio;
-	unsigned int cos;
-	unsigned int cos_audio;
-} qos = { 0, 0, 0, 0 };
-
-static int immediate = 0;
-
-static int callwaiting = 0;
-
-static int callreturn = 0;
-
-static int slowsequence = 0;
-
-static int threewaycalling = 0;
-
-/*! This is for flashhook transfers */
-static int transfer = 0;
-
-static int cancallforward = 0;
-
-static int singlepath = 0;
-
-static int directmedia = DIRECTMEDIA;
-
-static char accountcode[AST_MAX_ACCOUNT_CODE] = "";
-
-static char mailbox[AST_MAX_MAILBOX_UNIQUEID];
-
-static int amaflags = 0;
-
-static int adsi = 0;
-
-static unsigned int oseq_global = 0;
-AST_MUTEX_DEFINE_STATIC(oseq_lock);
-
-/*! Wait up to 16 seconds for first digit (FXO logic) */
-static int firstdigittimeout = 16000;
-
-/*! How long to wait for following digits (FXO logic) */
-static int gendigittimeout = 8000;
-
-/*! How long to wait for an extra digit, if there is an ambiguous match */
-static int matchdigittimeout = 3000;
-
-/*! 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(netlock);
-
-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 = AST_PTHREADT_NULL;
-
-static int restart_monitor(void);
-
-static struct ast_format_cap *global_capability;
-static int nonCodecCapability = AST_RTP_DTMF;
-
-static char ourhost[MAXHOSTNAMELEN];
-static struct in_addr __ourip;
-static int ourport;
-
-static struct ast_sched_context *sched;
-static struct io_context *io;
-/*! The private structures of the mgcp channels are linked for
- * selecting outgoing channels
- */
-
-#define MGCP_MAX_HEADERS	64
-#define MGCP_MAX_LINES		64
-
-struct mgcp_request {
-	int len;
-	char *verb;
-	char *identifier;
-	char *endpoint;
-	char *version;
-	int headers;			/*!< MGCP Headers */
-	char *header[MGCP_MAX_HEADERS];
-	int lines;			/*!< SDP Content */
-	char *line[MGCP_MAX_LINES];
-	char data[MGCP_MAX_PACKET];
-	int cmd;                        /*!< int version of verb = command */
-	unsigned int trid;              /*!< int version of identifier = transaction id */
-	struct mgcp_request *next;      /*!< next in the queue */
-};
-
-/*! \brief mgcp_message: MGCP message for queuing up */
-struct mgcp_message {
-	struct mgcp_endpoint *owner_ep;
-	struct mgcp_subchannel *owner_sub;
-	int retrans;
-	unsigned long expire;
-	unsigned int seqno;
-	int len;
-	struct mgcp_message *next;
-	char buf[0];
-};
-
-#define RESPONSE_TIMEOUT 30	/*!< in seconds */
-
-struct mgcp_response {
-	time_t whensent;
-	int len;
-	int seqno;
-	struct mgcp_response *next;
-	char buf[0];
-};
-
-#define MAX_SUBS 2
-
-#define SUB_REAL 0
-#define SUB_ALT  1
-
-struct mgcp_subchannel {
-	/*! subchannel magic string.
-	   Needed to prove that any subchannel pointer passed by asterisk
-	   really points to a valid subchannel memory area.
-	   Ugly.. But serves the purpose for the time being.
-	 */
-#define MGCP_SUBCHANNEL_MAGIC "!978!"
-	char magic[6];
-	ast_mutex_t lock;
-	int id;
-	struct ast_channel *owner;
-	struct mgcp_endpoint *parent;
-	struct ast_rtp_instance *rtp;
-	struct sockaddr_in tmpdest;
-	char txident[80]; /*! \todo FIXME txident is replaced by rqnt_ident in endpoint.
-			This should be obsoleted */
-	char cxident[80];
-	char callid[80];
-	int cxmode;
-	struct mgcp_request *cx_queue; /*!< pending CX commands */
-	ast_mutex_t cx_queue_lock;     /*!< CX queue lock */
-	int nat;
-	int iseq;                      /*!< Not used? RTP? */
-	int outgoing;
-	int alreadygone;
-	int sdpsent;
-	struct cops_gate *gate;
-	struct mgcp_subchannel *next;  /*!< for out circular linked list */
-};
-
-#define MGCP_ONHOOK  1
-#define MGCP_OFFHOOK 2
-
-#define TYPE_TRUNK 1
-#define TYPE_LINE  2
-
-struct mgcp_endpoint {
-	ast_mutex_t lock;
-	char name[80];
-	struct mgcp_subchannel *sub;		/*!< Pointer to our current connection, channel and stuff */
-	char accountcode[AST_MAX_ACCOUNT_CODE];
-	char exten[AST_MAX_EXTENSION];		/*!< Extension where to start */
-	char context[AST_MAX_EXTENSION];
-	char language[MAX_LANGUAGE];
-	char cid_num[AST_MAX_EXTENSION];	/*!< Caller*ID number */
-	char cid_name[AST_MAX_EXTENSION];	/*!< Caller*ID name */
-	char lastcallerid[AST_MAX_EXTENSION];	/*!< Last Caller*ID */
-	char dtmf_buf[AST_MAX_EXTENSION];	/*!< place to collect digits be */
-	char call_forward[AST_MAX_EXTENSION];	/*!< Last Caller*ID */
-	char musicclass[MAX_MUSICCLASS];
-	char curtone[80];			/*!< Current tone */
-	char mailbox[AST_MAX_EXTENSION];
-	char parkinglot[AST_MAX_CONTEXT];   /*!< Parkinglot */
-	struct ast_mwi_subscriber *mwi_event_sub;
-	ast_group_t callgroup;
-	ast_group_t pickupgroup;
-	int callwaiting;
-	int hascallwaiting;
-	int transfer;
-	int threewaycalling;
-	int singlepath;
-	int cancallforward;
-	int directmedia;
-	int callreturn;
-	int dnd; /* How does this affect callwait? Do we just deny a mgcp_request if we're dnd? */
-	int hascallerid;
-	int hidecallerid;
-	int dtmfmode;
-	int amaflags;
-	int ncs;
-	int pktcgatealloc;
-	int hangupongateremove;
-	int type;
-	int slowsequence;			/*!< MS: Sequence the endpoint as a whole */
-	int group;
-	int iseq; /*!< Not used? */
-	int lastout; /*!< tracking this on the subchannels.  Is it needed here? */
-	int needdestroy; /*!< Not used? */
-	struct ast_format_cap *cap;
-	int nonCodecCapability;
-	int onhooktime;
-	int msgstate; /*!< voicemail message state */
-	int immediate;
-	int hookstate;
-	int adsi;
-	char rqnt_ident[80];             /*!< request identifier */
-	struct mgcp_request *rqnt_queue; /*!< pending RQNT commands */
-	ast_mutex_t rqnt_queue_lock;
-	struct mgcp_request *cmd_queue;  /*!< pending commands other than RQNT */
-	ast_mutex_t cmd_queue_lock;
-	int delme;                       /*!< needed for reload */
-	int needaudit;                   /*!< needed for reload */
-	struct ast_dsp *dsp; /*!< XXX Should there be a dsp/subchannel? XXX */
-	/* owner is tracked on the subchannels, and the *sub indicates whos in charge */
-	/* struct ast_channel *owner; */
-	/* struct ast_rtp *rtp; */
-	/* struct sockaddr_in tmpdest; */
-	/* message go the endpoint and not the channel so they stay here */
-	struct ast_variable *chanvars;		/*!< Variables to set for channel created by user */
-	struct mgcp_endpoint *next;
-	struct mgcp_gateway *parent;
-};
-
-static struct mgcp_gateway {
-	/* A gateway containing one or more endpoints */
-	char name[80];
-	int isnamedottedip; /*!< is the name FQDN or dotted ip */
-	struct sockaddr_in addr;
-	struct sockaddr_in defaddr;
-	struct in_addr ourip;
-	int dynamic;
-	int expire;		/*!< XXX Should we ever expire dynamic registrations? XXX */
-	struct mgcp_endpoint *endpoints;
-	struct ast_ha *ha;
-/* obsolete
-	time_t lastouttime;
-	int lastout;
-	int messagepending;
-*/
-/* Wildcard endpoint name */
-	char wcardep[30];
-	struct mgcp_message *msgs; /*!< gw msg queue */
-	ast_mutex_t msgs_lock;     /*!< queue lock */
-	int retransid;             /*!< retrans timer id */
-	int delme;                 /*!< needed for reload */
-	int realtime;
-	struct mgcp_response *responses;
-	struct mgcp_gateway *next;
-} *gateways = NULL;
-
-AST_MUTEX_DEFINE_STATIC(mgcp_reload_lock);
-static int mgcp_reloading = 0;
-
-/*! \brief gatelock: mutex for gateway/endpoint lists */
-AST_MUTEX_DEFINE_STATIC(gatelock);
-
-static int mgcpsock  = -1;
-
-static struct sockaddr_in bindaddr;
-
-static void mgcp_set_owner(struct mgcp_subchannel *sub, struct ast_channel *chan);
-static struct ast_frame  *mgcp_read(struct ast_channel *ast);
-static int transmit_response(struct mgcp_subchannel *sub, char *msg, struct mgcp_request *req, char *msgrest);
-static int transmit_notify_request(struct mgcp_subchannel *sub, char *tone);
-static int transmit_modify_request(struct mgcp_subchannel *sub);
-static int transmit_connect(struct mgcp_subchannel *sub);
-static int transmit_notify_request_with_callerid(struct mgcp_subchannel *sub, char *tone, char *callernum, char *callername);
-static int transmit_modify_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp_instance *rtp, const struct ast_format_cap *codecs);
-static int transmit_connection_del(struct mgcp_subchannel *sub);
-static int transmit_audit_endpoint(struct mgcp_endpoint *p);
-static void start_rtp(struct mgcp_subchannel *sub);
-static void handle_response(struct mgcp_endpoint *p, struct mgcp_subchannel *sub,
-                            int result, unsigned int ident, struct mgcp_request *resp);
-static void dump_cmd_queues(struct mgcp_endpoint *p, struct mgcp_subchannel *sub);
-static char *mgcp_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-static int reload_config(int reload);
-
-static struct ast_channel *mgcp_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *dest, int *cause);
-static int mgcp_call(struct ast_channel *ast, const char *dest, int timeout);
-static int mgcp_hangup(struct ast_channel *ast);
-static int mgcp_answer(struct ast_channel *ast);
-static struct ast_frame *mgcp_read(struct ast_channel *ast);
-static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame);
-static int mgcp_indicate(struct ast_channel *ast, int ind, const void *data, size_t datalen);
-static int mgcp_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-static int mgcp_senddigit_begin(struct ast_channel *ast, char digit);
-static int mgcp_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration);
-static int mgcp_devicestate(const char *data);
-static void add_header_offhook(struct mgcp_subchannel *sub, struct mgcp_request *resp, char *tone);
-static int transmit_connect_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp_instance *rtp);
-static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v);
-static int mgcp_alloc_pktcgate(struct mgcp_subchannel *sub);
-static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *preparse, char *buf, size_t buflen);
-static struct ast_variable *add_var(const char *buf, struct ast_variable *list);
-static struct ast_variable *copy_vars(struct ast_variable *src);
-
-static struct ast_channel_tech mgcp_tech = {
-	.type = "MGCP",
-	.description = tdesc,
-	.properties = AST_CHAN_TP_WANTSJITTER | AST_CHAN_TP_CREATESJITTER,
-	.requester = mgcp_request,
-	.devicestate = mgcp_devicestate,
-	.call = mgcp_call,
-	.hangup = mgcp_hangup,
-	.answer = mgcp_answer,
-	.read = mgcp_read,
-	.write = mgcp_write,
-	.indicate = mgcp_indicate,
-	.fixup = mgcp_fixup,
-	.send_digit_begin = mgcp_senddigit_begin,
-	.send_digit_end = mgcp_senddigit_end,
-	.func_channel_read = acf_channel_read,
-};
-
-static int has_voicemail(struct mgcp_endpoint *p)
-{
-	int new_msgs;
-	RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
-
-	msg = stasis_cache_get(ast_mwi_state_cache(), ast_mwi_state_type(), p->mailbox);
-	if (msg) {
-		struct ast_mwi_state *mwi_state = stasis_message_data(msg);
-		new_msgs = mwi_state->new_msgs;
-	} else {
-		new_msgs = ast_app_has_voicemail(p->mailbox, NULL);
-	}
-
-	return new_msgs;
-}
-
-static int unalloc_sub(struct mgcp_subchannel *sub)
-{
-	struct mgcp_endpoint *p = sub->parent;
-	if (p->sub == sub) {
-		ast_log(LOG_WARNING, "Trying to unalloc the real channel %s@%s?!?\n", p->name, p->parent->name);
-		return -1;
-	}
-	ast_debug(1, "Released sub %d of channel %s@%s\n", sub->id, p->name, p->parent->name);
-
-	mgcp_set_owner(sub, NULL);
-	if (!ast_strlen_zero(sub->cxident)) {
-		transmit_connection_del(sub);
-	}
-	sub->cxident[0] = '\0';
-	sub->callid[0] = '\0';
-	sub->cxmode = MGCP_CX_INACTIVE;
-	sub->outgoing = 0;
-	sub->alreadygone = 0;
-	memset(&sub->tmpdest, 0, sizeof(sub->tmpdest));
-	if (sub->rtp) {
-		ast_rtp_instance_destroy(sub->rtp);
-		sub->rtp = NULL;
-	}
-	dump_cmd_queues(NULL, sub);
-	return 0;
-}
-
-/* modified for new transport mechanism */
-static int __mgcp_xmit(struct mgcp_gateway *gw, char *data, int len)
-{
-	int res;
-	if (gw->addr.sin_addr.s_addr)
-		res=sendto(mgcpsock, data, len, 0, (struct sockaddr *)&gw->addr, sizeof(struct sockaddr_in));
-	else
-		res=sendto(mgcpsock, data, len, 0, (struct sockaddr *)&gw->defaddr, sizeof(struct sockaddr_in));
-	if (res != len) {
-		ast_log(LOG_WARNING, "mgcp_xmit returned %d: %s\n", res, strerror(errno));
-	}
-	return res;
-}
-
-static int resend_response(struct mgcp_subchannel *sub, struct mgcp_response *resp)
-{
-	struct mgcp_endpoint *p = sub->parent;
-	int res;
-	ast_debug(1, "Retransmitting:\n%s\n to %s:%d\n", resp->buf, ast_inet_ntoa(p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port));
-	res = __mgcp_xmit(p->parent, resp->buf, resp->len);
-	if (res > 0)
-		res = 0;
-	return res;
-}
-
-static int send_response(struct mgcp_subchannel *sub, struct mgcp_request *req)
-{
-	struct mgcp_endpoint *p = sub->parent;
-	int res;
-	ast_debug(1, "Transmitting:\n%s\n to %s:%d\n", req->data, ast_inet_ntoa(p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port));
-	res = __mgcp_xmit(p->parent, req->data, req->len);
-	if (res > 0)
-		res = 0;
-	return res;
-}
-
-/* modified for new transport framework */
-static void dump_queue(struct mgcp_gateway *gw, struct mgcp_endpoint *p)
-{
-	struct mgcp_message *cur, *q = NULL, *w, *prev;
-
-	ast_mutex_lock(&gw->msgs_lock);
-	for (prev = NULL, cur = gw->msgs; cur; prev = cur, cur = cur->next) {
-		if (!p || cur->owner_ep == p) {
-			if (prev) {
-				prev->next = cur->next;
-			} else {
-				gw->msgs = cur->next;
-			}
-
-			ast_log(LOG_NOTICE, "Removing message from %s transaction %u\n",
-				gw->name, cur->seqno);
-
-			w = cur;
-			if (q) {
-				w->next = q;
-			} else {
-				w->next = NULL;
-			}
-			q = w;
-		}
-	}
-	ast_mutex_unlock(&gw->msgs_lock);
-
-	while (q) {
-		cur = q;
-		q = q->next;
-		ast_free(cur);
-	}
-}
-
-static void mgcp_queue_frame(struct mgcp_subchannel *sub, struct ast_frame *f)
-{
-	for (;;) {
-		if (sub->owner) {
-			if (!ast_channel_trylock(sub->owner)) {
-				ast_queue_frame(sub->owner, f);
-				ast_channel_unlock(sub->owner);
-				break;
-			} else {
-				DEADLOCK_AVOIDANCE(&sub->lock);
-			}
-		} else {
-			break;
-		}
-	}
-}
-
-static void mgcp_queue_hangup(struct mgcp_subchannel *sub)
-{
-	for (;;) {
-		if (sub->owner) {
-			if (!ast_channel_trylock(sub->owner)) {
-				ast_queue_hangup(sub->owner);
-				ast_channel_unlock(sub->owner);
-				break;
-			} else {
-				DEADLOCK_AVOIDANCE(&sub->lock);
-			}
-		} else {
-			break;
-		}
-	}
-}
-
-static void mgcp_queue_control(struct mgcp_subchannel *sub, int control)
-{
-	struct ast_frame f = { AST_FRAME_CONTROL, { control } };
-	return mgcp_queue_frame(sub, &f);
-}
-
-static int retrans_pkt(const void *data)
-{
-	struct mgcp_gateway *gw = (struct mgcp_gateway *)data;
-	struct mgcp_message *cur, *exq = NULL, *w, *prev;
-	int res = 0;
-
-	/* find out expired msgs */
-	ast_mutex_lock(&gw->msgs_lock);
-
-	for (prev = NULL, cur = gw->msgs; cur; prev = cur, cur = cur->next) {
-		if (cur->retrans < MAX_RETRANS) {
-			cur->retrans++;
-			ast_debug(1, "Retransmitting #%d transaction %u on [%s]\n",
-				cur->retrans, cur->seqno, gw->name);
-			__mgcp_xmit(gw, cur->buf, cur->len);
-		} else {
-			if (prev)
-				prev->next = cur->next;
-			else
-				gw->msgs = cur->next;
-
-			ast_log(LOG_WARNING, "Maximum retries exceeded for transaction %u on [%s]\n",
-				cur->seqno, gw->name);
-
-			w = cur;
-
-			if (exq) {
-				w->next = exq;
-			} else {
-				w->next = NULL;
-			}
-			exq = w;
-		}
-	}
-
-	if (!gw->msgs) {
-		gw->retransid = -1;
-		res = 0;
-	} else {
-		res = 1;
-	}
-	ast_mutex_unlock(&gw->msgs_lock);
-
-	while (exq) {
-		cur = exq;
-		/* time-out transaction */
-		handle_response(cur->owner_ep, cur->owner_sub, 406, cur->seqno, NULL);
-		exq = exq->next;
-		ast_free(cur);
-	}
-
-	return res;
-}
-
-/* modified for the new transaction mechanism */
-static int mgcp_postrequest(struct mgcp_endpoint *p, struct mgcp_subchannel *sub,
-                            char *data, int len, unsigned int seqno)
-{
-	struct mgcp_message *msg;
-	struct mgcp_message *cur;
-	struct mgcp_gateway *gw;
-	struct timeval now;
-
-	if (!(msg = ast_malloc(sizeof(*msg) + len))) {
-		return -1;
-	}
-	if (!(gw = ((p && p->parent) ? p->parent : NULL))) {
-		ast_free(msg);
-		return -1;
-	}
-
-	msg->owner_sub = sub;
-	msg->owner_ep = p;
-	msg->seqno = seqno;
-	msg->next = NULL;
-	msg->len = len;
-	msg->retrans = 0;
-	memcpy(msg->buf, data, msg->len);
-
-	ast_mutex_lock(&gw->msgs_lock);
-	for (cur = gw->msgs; cur && cur->next; cur = cur->next);
-	if (cur) {
-		cur->next = msg;
-	} else {
-		gw->msgs = msg;
-	}
-
-	now = ast_tvnow();
-	msg->expire = now.tv_sec * 1000 + now.tv_usec / 1000 + DEFAULT_RETRANS;
-
-	if (gw->retransid == -1)
-		gw->retransid = ast_sched_add(sched, DEFAULT_RETRANS, retrans_pkt, (void *)gw);
-	ast_mutex_unlock(&gw->msgs_lock);
-	__mgcp_xmit(gw, msg->buf, msg->len);
-	/* XXX Should schedule retransmission XXX */
-	return 0;
-}
-
-/* modified for new transport */
-static int send_request(struct mgcp_endpoint *p, struct mgcp_subchannel *sub,
-                        struct mgcp_request *req, unsigned int seqno)
-{
-	int res = 0;
-	struct mgcp_request **queue, *q, *r, *t;
-	ast_mutex_t *l;
-
-	ast_debug(1, "Slow sequence is %d\n", p->slowsequence);
-	if (p->slowsequence) {
-		queue = &p->cmd_queue;
-		l = &p->cmd_queue_lock;
-		ast_mutex_lock(l);
-	} else {
-		switch (req->cmd) {
-		case MGCP_CMD_DLCX:
-			queue = &sub->cx_queue;
-			l = &sub->cx_queue_lock;
-			ast_mutex_lock(l);
-			q = sub->cx_queue;
-			/* delete pending cx cmds */
-			/* buggy sb5120 */
-			if (!sub->parent->ncs) {
-				while (q) {
-					r = q->next;
-					ast_free(q);
-					q = r;
-				}
-				*queue = NULL;
-			}
-			break;
-
-		case MGCP_CMD_CRCX:
-		case MGCP_CMD_MDCX:
-			queue = &sub->cx_queue;
-			l = &sub->cx_queue_lock;
-			ast_mutex_lock(l);
-			break;
-
-		case MGCP_CMD_RQNT:
-			queue = &p->rqnt_queue;
-			l = &p->rqnt_queue_lock;
-			ast_mutex_lock(l);
-			break;
-
-		default:
-			queue = &p->cmd_queue;
-			l = &p->cmd_queue_lock;
-			ast_mutex_lock(l);
-			break;
-		}
-	}
-
-	if (!(r = ast_malloc(sizeof(*r)))) {
-		ast_log(LOG_WARNING, "Cannot post MGCP request: insufficient memory\n");
-		ast_mutex_unlock(l);
-		return -1;
-	}
-	memcpy(r, req, sizeof(*r));
-
-	if (!(*queue)) {
-		ast_debug(1, "Posting Request:\n%s to %s:%d\n", req->data,
-			ast_inet_ntoa(p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port));
-
-		res = mgcp_postrequest(p, sub, req->data, req->len, seqno);
-	} else {
-		ast_debug(1, "Queueing Request:\n%s to %s:%d\n", req->data,
-			ast_inet_ntoa(p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port));
-	}
-
-	/* XXX find tail. We could also keep tail in the data struct for faster access */
-	for (t = *queue; t && t->next; t = t->next);
-
-	r->next = NULL;
-	if (t)
-		t->next = r;
-	else
-		*queue = r;
-
-	ast_mutex_unlock(l);
-
-	return res;
-}
-
-static int mgcp_call(struct ast_channel *ast, const char *dest, int timeout)
-{
-	int res;
-	struct mgcp_endpoint *p;
-	struct mgcp_subchannel *sub;
-	char tone[50] = "";
-	const char *distinctive_ring = pbx_builtin_getvar_helper(ast, "ALERT_INFO");
-
-	ast_debug(3, "MGCP mgcp_call(%s)\n", ast_channel_name(ast));
-	sub = ast_channel_tech_pvt(ast);
-	p = sub->parent;
-
-	ast_mutex_lock(&sub->lock);
-	switch (p->hookstate) {
-	case MGCP_OFFHOOK:
-		if (!ast_strlen_zero(distinctive_ring)) {
-			snprintf(tone, sizeof(tone), "L/wt%s", distinctive_ring);
-			ast_debug(3, "MGCP distinctive callwait %s\n", tone);
-		} else {
-			ast_copy_string(tone, (p->ncs ? "L/wt1" : "L/wt"), sizeof(tone));
-			ast_debug(3, "MGCP normal callwait %s\n", tone);
-		}
-		break;
-	case MGCP_ONHOOK:
-	default:
-		if (!ast_strlen_zero(distinctive_ring)) {
-			snprintf(tone, sizeof(tone), "L/r%s", distinctive_ring);
-			ast_debug(3, "MGCP distinctive ring %s\n", tone);
-		} else {
-			ast_copy_string(tone, "L/rg", sizeof(tone));
-			ast_debug(3, "MGCP default ring\n");
-		}
-		break;
-	}
-
-	if ((ast_channel_state(ast) != AST_STATE_DOWN) && (ast_channel_state(ast) != AST_STATE_RESERVED)) {
-		ast_log(LOG_WARNING, "mgcp_call called on %s, neither down nor reserved\n", ast_channel_name(ast));
-		ast_mutex_unlock(&sub->lock);
-		return -1;
-	}
-
-	res = 0;
-	sub->outgoing = 1;
-	sub->cxmode = MGCP_CX_RECVONLY;
-	ast_setstate(ast, AST_STATE_RINGING);
-	if (p->type == TYPE_LINE) {
-		if (!sub->rtp) {
-			start_rtp(sub);
-		} else {
-			transmit_modify_request(sub);
-		}
-
-		if (sub->next->owner && !ast_strlen_zero(sub->next->cxident) && !ast_strlen_zero(sub->next->callid)) {
-			/* try to prevent a callwait from disturbing the other connection */
-			sub->next->cxmode = MGCP_CX_RECVONLY;
-			transmit_modify_request(sub->next);
-		}
-
-		transmit_notify_request_with_callerid(sub, tone,
-			S_COR(ast_channel_connected(ast)->id.number.valid, ast_channel_connected(ast)->id.number.str, ""),
-			S_COR(ast_channel_connected(ast)->id.name.valid, ast_channel_connected(ast)->id.name.str, ""));
-		ast_setstate(ast, AST_STATE_RINGING);
-
-		if (sub->next->owner && !ast_strlen_zero(sub->next->cxident) && !ast_strlen_zero(sub->next->callid)) {
-			/* Put the connection back in sendrecv */
-			sub->next->cxmode = MGCP_CX_SENDRECV;
-			transmit_modify_request(sub->next);
-		}
-	} else {
-		ast_log(LOG_NOTICE, "Don't know how to dial on trunks yet\n");
-		res = -1;
-	}
-	ast_mutex_unlock(&sub->lock);
-	return res;
-}
-
-static int mgcp_hangup(struct ast_channel *ast)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
-	struct mgcp_endpoint *p = sub->parent;
-
-	ast_debug(1, "mgcp_hangup(%s)\n", ast_channel_name(ast));
-	if (!ast_channel_tech_pvt(ast)) {
-		ast_debug(1, "Asked to hangup channel not connected\n");
-		return 0;
-	}
-	if (strcmp(sub->magic, MGCP_SUBCHANNEL_MAGIC)) {
-		ast_debug(1, "Invalid magic. MGCP subchannel freed up already.\n");
-		return 0;
-	}
-	ast_mutex_lock(&sub->lock);
-	ast_debug(3, "MGCP mgcp_hangup(%s) on %s@%s\n", ast_channel_name(ast), p->name, p->parent->name);
-
-	if ((p->dtmfmode & MGCP_DTMF_INBAND) && p->dsp) {
-		/* check whether other channel is active. */
-		if (!sub->next->owner) {
-			if (p->dtmfmode & MGCP_DTMF_HYBRID) {
-				p->dtmfmode &= ~MGCP_DTMF_INBAND;
-			}
-			ast_debug(2, "MGCP free dsp on %s@%s\n", p->name, p->parent->name);
-			ast_dsp_free(p->dsp);
-			p->dsp = NULL;
-		}
-	}
-
-	mgcp_set_owner(sub, NULL);
-
-	/* for deleting gate */
-	if (p->pktcgatealloc && sub->gate) {
-		sub->gate->gate_open = NULL;
-		sub->gate->gate_remove = NULL;
-		sub->gate->got_dq_gi = NULL;
-		sub->gate->tech_pvt = NULL;
-		if (sub->gate->state == GATE_ALLOC_PROGRESS || sub->gate->state == GATE_ALLOCATED) {
-			ast_pktccops_gate_alloc(GATE_DEL, sub->gate, 0, 0, 0, 0, 0, 0, NULL, NULL);
-		} else {
-			sub->gate->deltimer = time(NULL) + 5;
-		}
-		sub->gate = NULL;
-	}
-
-	if (!ast_strlen_zero(sub->cxident)) {
-		transmit_connection_del(sub);
-	}
-	sub->cxident[0] = '\0';
-	if ((sub == p->sub) && sub->next->owner) {
-		RAII_VAR(struct ast_channel *, bridged, ast_channel_bridge_peer(sub->next->owner), ast_channel_cleanup);
-
-		if (p->hookstate == MGCP_OFFHOOK) {
-			if (sub->next->owner && bridged) {
-				/* ncs fix! */
-				transmit_notify_request_with_callerid(p->sub, (p->ncs ? "L/wt1" : "L/wt"),
-					S_COR(ast_channel_caller(bridged)->id.number.valid, ast_channel_caller(bridged)->id.number.str, ""),
-					S_COR(ast_channel_caller(bridged)->id.name.valid, ast_channel_caller(bridged)->id.name.str, ""));
-			}
-		} else {
-			/* set our other connection as the primary and swith over to it */
-			p->sub = sub->next;
-			p->sub->cxmode = MGCP_CX_RECVONLY;
-			transmit_modify_request(p->sub);
-			if (sub->next->owner && bridged) {
-				transmit_notify_request_with_callerid(p->sub, "L/rg",
-					S_COR(ast_channel_caller(bridged)->id.number.valid, ast_channel_caller(bridged)->id.number.str, ""),
-					S_COR(ast_channel_caller(bridged)->id.name.valid, ast_channel_caller(bridged)->id.name.str, ""));
-			}
-		}
-
-	} else if ((sub == p->sub->next) && p->hookstate == MGCP_OFFHOOK) {
-		transmit_notify_request(sub, p->ncs ? "" : "L/v");
-	} else if (p->hookstate == MGCP_OFFHOOK) {
-		transmit_notify_request(sub, "L/ro");
-	} else {
-		transmit_notify_request(sub, "");
-	}
-
-	ast_channel_tech_pvt_set(ast, NULL);
-	sub->alreadygone = 0;
-	sub->outgoing = 0;
-	sub->cxmode = MGCP_CX_INACTIVE;
-	sub->callid[0] = '\0';
-	if (p) {
-		memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-	}
-	/* Reset temporary destination */
-	memset(&sub->tmpdest, 0, sizeof(sub->tmpdest));
-	if (sub->rtp) {
-		ast_rtp_instance_destroy(sub->rtp);
-		sub->rtp = NULL;
-	}
-
-	ast_module_unref(ast_module_info->self);
-
-	if ((p->hookstate == MGCP_ONHOOK) && (!sub->next->rtp)) {
-		p->hidecallerid = 0;
-		if (p->hascallwaiting && !p->callwaiting) {
-			ast_verb(3, "Enabling call waiting on %s\n", ast_channel_name(ast));
-			p->callwaiting = -1;
-		}
-		if (has_voicemail(p)) {
-			ast_debug(3, "MGCP mgcp_hangup(%s) on %s@%s set vmwi(+)\n",
-				ast_channel_name(ast), p->name, p->parent->name);
-			transmit_notify_request(sub, "L/vmwi(+)");
-		} else {
-			ast_debug(3, "MGCP mgcp_hangup(%s) on %s@%s set vmwi(-)\n",
-				ast_channel_name(ast), p->name, p->parent->name);
-			transmit_notify_request(sub, "L/vmwi(-)");
-		}
-	}
-	ast_mutex_unlock(&sub->lock);
-	return 0;
-}
-
-static char *handle_mgcp_show_endpoints(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	struct mgcp_gateway  *mg;
-	struct mgcp_endpoint *me;
-	int hasendpoints = 0;
-	struct ast_variable * v = NULL;
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "mgcp show endpoints";
-		e->usage =
-			"Usage: mgcp show endpoints\n"
-			"       Lists all endpoints known to the MGCP (Media Gateway Control Protocol) subsystem.\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	if (a->argc != 3) {
-		return CLI_SHOWUSAGE;
-	}
-	ast_mutex_lock(&gatelock);
-	for (mg = gateways; mg; mg = mg->next) {
-		ast_cli(a->fd, "Gateway '%s' at %s (%s%s)\n", mg->name, mg->addr.sin_addr.s_addr ? ast_inet_ntoa(mg->addr.sin_addr) : ast_inet_ntoa(mg->defaddr.sin_addr), mg->realtime ? "Realtime, " : "", mg->dynamic ? "Dynamic" : "Static");
-		for (me = mg->endpoints; me; me = me->next) {
-			ast_cli(a->fd, "   -- '%s@%s in '%s' is %s\n", me->name, mg->name, me->context, me->sub->owner ? "active" : "idle");
-			if (me->chanvars) {
-				ast_cli(a->fd, "  Variables:\n");
-				for (v = me->chanvars ; v ; v = v->next) {
-					ast_cli(a->fd, "    %s = '%s'\n", v->name, v->value);
-				}
-			}
-			hasendpoints = 1;
-		}
-		if (!hasendpoints) {
-			ast_cli(a->fd, "   << No Endpoints Defined >>     ");
-		}
-	}
-	ast_mutex_unlock(&gatelock);
-	return CLI_SUCCESS;
-}
-
-static char *handle_mgcp_audit_endpoint(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	struct mgcp_gateway  *mg;
-	struct mgcp_endpoint *me;
-	int found = 0;
-	char *ename,*gname, *c;
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "mgcp audit endpoint";
-		e->usage =
-			"Usage: mgcp audit endpoint <endpointid>\n"
-			"       Lists the capabilities of an endpoint in the MGCP (Media Gateway Control Protocol) subsystem.\n"
-			"       Debug logging (core set debug on) MUST be on to see the results of this command.\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	if (!DEBUG_ATLEAST(1)) {
-		return CLI_SHOWUSAGE;
-	}
-	if (a->argc != 4)
-		return CLI_SHOWUSAGE;
-	/* split the name into parts by null */
-	ename = ast_strdupa(a->argv[3]);
-	for (gname = ename; *gname; gname++) {
-		if (*gname == '@') {
-			*gname = 0;
-			gname++;
-			break;
-		}
-	}
-	if (gname[0] == '[') {
-		gname++;
-	}
-	if ((c = strrchr(gname, ']'))) {
-		*c = '\0';
-	}
-	ast_mutex_lock(&gatelock);
-	for (mg = gateways; mg; mg = mg->next) {
-		if (!strcasecmp(mg->name, gname)) {
-			for (me = mg->endpoints; me; me = me->next) {
-				if (!strcasecmp(me->name, ename)) {
-					found = 1;
-					transmit_audit_endpoint(me);
-					break;
-				}
-			}
-			if (found) {
-				break;
-			}
-		}
-	}
-	if (!found) {
-		ast_cli(a->fd, "   << Could not find endpoint >>     ");
-	}
-	ast_mutex_unlock(&gatelock);
-	return CLI_SUCCESS;
-}
-
-static struct ast_cli_entry cli_mgcp[] = {
-	AST_CLI_DEFINE(handle_mgcp_audit_endpoint, "Audit specified MGCP endpoint"),
-	AST_CLI_DEFINE(handle_mgcp_show_endpoints, "List defined MGCP endpoints"),
-	AST_CLI_DEFINE(mgcp_reload, "Reload MGCP configuration"),
-};
-
-static int mgcp_answer(struct ast_channel *ast)
-{
-	int res = 0;
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
-	struct mgcp_endpoint *p = sub->parent;
-
-	ast_mutex_lock(&sub->lock);
-	sub->cxmode = MGCP_CX_SENDRECV;
-	if (!sub->rtp) {
-		start_rtp(sub);
-	} else {
-		transmit_modify_request(sub);
-	}
-	ast_verb(3, "MGCP mgcp_answer(%s) on %s@%s-%d\n",
-			ast_channel_name(ast), p->name, p->parent->name, sub->id);
-	if (ast_channel_state(ast) != AST_STATE_UP) {
-		ast_setstate(ast, AST_STATE_UP);
-		ast_debug(1, "mgcp_answer(%s)\n", ast_channel_name(ast));
-		transmit_notify_request(sub, "");
-		transmit_modify_request(sub);
-	}
-	ast_mutex_unlock(&sub->lock);
-	return res;
-}
-
-static struct ast_frame *mgcp_rtp_read(struct mgcp_subchannel *sub)
-{
-	/* Retrieve audio/etc from channel.  Assumes sub->lock is already held. */
-	struct ast_frame *f;
-
-	f = ast_rtp_instance_read(sub->rtp, 0);
-	/* Don't send RFC2833 if we're not supposed to */
-	if (f && (f->frametype == AST_FRAME_DTMF) && !(sub->parent->dtmfmode & MGCP_DTMF_RFC2833))
-		return &ast_null_frame;
-	if (sub->owner) {
-		/* We already hold the channel lock */
-		if (f->frametype == AST_FRAME_VOICE) {
-			if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(sub->owner), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
-				struct ast_format_cap *caps;
-
-				ast_debug(1, "Oooh, format changed to %s\n", ast_format_get_name(f->subclass.format));
-
-				caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-				if (caps) {
-					ast_format_cap_append(caps, f->subclass.format, 0);
-					ast_channel_nativeformats_set(sub->owner, caps);
-					ao2_ref(caps, -1);
-				} else {
-					return &ast_null_frame;
-				}
-
-				ast_set_read_format(sub->owner, ast_channel_readformat(sub->owner));
-				ast_set_write_format(sub->owner, ast_channel_writeformat(sub->owner));
-			}
-			/* Courtesy fearnor aka alex at pilosoft.com */
-			if ((sub->parent->dtmfmode & MGCP_DTMF_INBAND) && (sub->parent->dsp)) {
-#if 0
-				ast_log(LOG_NOTICE, "MGCP ast_dsp_process\n");
-#endif
-				f = ast_dsp_process(sub->owner, sub->parent->dsp, f);
-			}
-		}
-	}
-	return f;
-}
-
-static void mgcp_set_owner(struct mgcp_subchannel *sub, struct ast_channel *chan)
-{
-	sub->owner = chan;
-	if (sub->rtp) {
-		ast_rtp_instance_set_channel_id(sub->rtp, sub->owner ? ast_channel_uniqueid(chan) : "");
-	}
-}
-
-static struct ast_frame *mgcp_read(struct ast_channel *ast)
-{
-	struct ast_frame *f;
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
-	ast_mutex_lock(&sub->lock);
-	f = mgcp_rtp_read(sub);
-	ast_mutex_unlock(&sub->lock);
-	return f;
-}
-
-static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
-	int res = 0;
-
-	if (frame->frametype != AST_FRAME_VOICE) {
-		if (frame->frametype == AST_FRAME_IMAGE)
-			return 0;
-		else {
-			ast_log(LOG_WARNING, "Can't send %u type frames with MGCP write\n", frame->frametype);
-			return 0;
-		}
-	} else {
-		if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
-			struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
-
-			ast_log(LOG_WARNING, "Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n",
-				ast_format_get_name(frame->subclass.format),
-				ast_format_cap_get_names(ast_channel_nativeformats(ast), &cap_buf),
-				ast_format_get_name(ast_channel_readformat(ast)),
-				ast_format_get_name(ast_channel_writeformat(ast)));
-			/* return -1; */
-		}
-	}
-	if (sub) {
-		ast_mutex_lock(&sub->lock);
-		if (!sub->sdpsent && sub->gate) {
-			if (sub->gate->state == GATE_ALLOCATED) {
-				ast_debug(1, "GATE ALLOCATED, sending sdp\n");
-				transmit_modify_with_sdp(sub, NULL, 0);
-			}
-		}
-		if ((sub->parent->sub == sub) || !sub->parent->singlepath) {
-			if (sub->rtp) {
-				res =  ast_rtp_instance_write(sub->rtp, frame);
-			}
-		}
-		ast_mutex_unlock(&sub->lock);
-	}
-	return res;
-}
-
-static int mgcp_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(newchan);
-
-	ast_mutex_lock(&sub->lock);
-	ast_log(LOG_NOTICE, "mgcp_fixup(%s, %s)\n", ast_channel_name(oldchan), ast_channel_name(newchan));
-	if (sub->owner != oldchan) {
-		ast_mutex_unlock(&sub->lock);
-		ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, sub->owner);
-		return -1;
-	}
-	mgcp_set_owner(sub, newchan);
-	ast_mutex_unlock(&sub->lock);
-	return 0;
-}
-
-static int mgcp_senddigit_begin(struct ast_channel *ast, char digit)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
-	struct mgcp_endpoint *p = sub->parent;
-	int res = 0;
-
-	ast_mutex_lock(&sub->lock);
-	if (p->dtmfmode & MGCP_DTMF_INBAND || p->dtmfmode & MGCP_DTMF_HYBRID) {
-		ast_debug(1, "Sending DTMF using inband/hybrid\n");
-		res = -1; /* Let asterisk play inband indications */
-	} else if (p->dtmfmode & MGCP_DTMF_RFC2833) {
-		ast_debug(1, "Sending DTMF using RFC2833\n");
-		ast_rtp_instance_dtmf_begin(sub->rtp, digit);
-	} else {
-		ast_log(LOG_ERROR, "Don't know about DTMF_MODE %d\n", p->dtmfmode);
-	}
-	ast_mutex_unlock(&sub->lock);
-
-	return res;
-}
-
-static int mgcp_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
-	struct mgcp_endpoint *p = sub->parent;
-	int res = 0;
-	char tmp[4];
-
-	ast_mutex_lock(&sub->lock);
-	if (p->dtmfmode & MGCP_DTMF_INBAND || p->dtmfmode & MGCP_DTMF_HYBRID) {
-		ast_debug(1, "Stopping DTMF using inband/hybrid\n");
-		res = -1; /* Tell Asterisk to stop inband indications */
-	} else if (p->dtmfmode & MGCP_DTMF_RFC2833) {
-		ast_debug(1, "Stopping DTMF using RFC2833\n");
-		if (sub->parent->ncs) {
-			tmp[0] = digit;
-			tmp[1] = '\0';
-		} else {
-			tmp[0] = 'D';
-			tmp[1] = '/';
-			tmp[2] = digit;
-			tmp[3] = '\0';
-		}
-		transmit_notify_request(sub, tmp);
-		ast_rtp_instance_dtmf_end(sub->rtp, digit);
-	} else {
-		ast_log(LOG_ERROR, "Don't know about DTMF_MODE %d\n", p->dtmfmode);
-	}
-	ast_mutex_unlock(&sub->lock);
-
-	return res;
-}
-
-/*!
- *  \brief  mgcp_devicestate: channel callback for device status monitoring
- *  \param  data tech/resource name of MGCP device to query
- *
- * Callback for device state management in channel subsystem
- * to obtain device status (up/down) of a specific MGCP endpoint
- *
- *  \return device status result (from devicestate.h) AST_DEVICE_INVALID (not available) or AST_DEVICE_UNKNOWN (available but unknown state)
- */
-static int mgcp_devicestate(const char *data)
-{
-	struct mgcp_gateway  *g;
-	struct mgcp_endpoint *e = NULL;
-	char *tmp, *endpt, *gw;
-	int ret = AST_DEVICE_INVALID;
-
-	endpt = ast_strdupa(data);
-	if ((tmp = strchr(endpt, '@'))) {
-		*tmp++ = '\0';
-		gw = tmp;
-	} else
-		goto error;
-
-	ast_mutex_lock(&gatelock);
-	for (g = gateways; g; g = g->next) {
-		if (strcasecmp(g->name, gw) == 0) {
-			e = g->endpoints;
-			break;
-		}
-	}
-
-	if (!e)
-		goto error;
-
-	for (; e; e = e->next) {
-		if (strcasecmp(e->name, endpt) == 0) {
-			break;
-		}
-	}
-
-	if (!e)
-		goto error;
-
-	/*
-	 * As long as the gateway/endpoint is valid, we'll
-	 * assume that the device is available and its state
-	 * can be tracked.
-	 */
-	ret = AST_DEVICE_UNKNOWN;
-
-error:
-	ast_mutex_unlock(&gatelock);
-	return ret;
-}
-
-static char *control2str(int ind) {
-	switch (ind) {
-	case AST_CONTROL_HANGUP:
-		return "Other end has hungup";
-	case AST_CONTROL_RING:
-		return "Local ring";
-	case AST_CONTROL_RINGING:
-		return "Remote end is ringing";
-	case AST_CONTROL_ANSWER:
-		return "Remote end has answered";
-	case AST_CONTROL_BUSY:
-		return "Remote end is busy";
-	case AST_CONTROL_TAKEOFFHOOK:
-		return "Make it go off hook";
-	case AST_CONTROL_OFFHOOK:
-		return "Line is off hook";
-	case AST_CONTROL_CONGESTION:
-		return "Congestion (circuits busy)";
-	case AST_CONTROL_FLASH:
-		return "Flash hook";
-	case AST_CONTROL_WINK:
-		return "Wink";
-	case AST_CONTROL_OPTION:
-		return "Set a low-level option";
-	case AST_CONTROL_RADIO_KEY:
-		return "Key Radio";
-	case AST_CONTROL_RADIO_UNKEY:
-		return "Un-Key Radio";
-	}
-	return "UNKNOWN";
-}
-
-static int mgcp_indicate(struct ast_channel *ast, int ind, const void *data, size_t datalen)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
-	int res = 0;
-
-	ast_debug(3, "MGCP asked to indicate %d '%s' condition on channel %s\n",
-		ind, control2str(ind), ast_channel_name(ast));
-	ast_mutex_lock(&sub->lock);
-	switch(ind) {
-	case AST_CONTROL_RINGING:
-#ifdef DLINK_BUGGY_FIRMWARE
-		transmit_notify_request(sub, "rt");
-#else
-		if (!sub->sdpsent) { /* will hide the inband progress!!! */
-			transmit_notify_request(sub, sub->parent->ncs ? "L/rt" : "G/rt");
-		}
-#endif
-		break;
-	case AST_CONTROL_BUSY:
-		transmit_notify_request(sub, "L/bz");
-		break;
-	case AST_CONTROL_INCOMPLETE:
-		/* We do not currently support resetting of the Interdigit Timer, so treat
-		 * Incomplete control frames as a congestion response
-		 */
-	case AST_CONTROL_CONGESTION:
-		transmit_notify_request(sub, sub->parent->ncs ? "L/cg" : "G/cg");
-		break;
-	case AST_CONTROL_HOLD:
-		ast_moh_start(ast, data, NULL);
-		break;
-	case AST_CONTROL_UNHOLD:
-		ast_moh_stop(ast);
-		break;
-	case AST_CONTROL_SRCUPDATE:
-		ast_rtp_instance_update_source(sub->rtp);
-		break;
-	case AST_CONTROL_SRCCHANGE:
-		ast_rtp_instance_change_source(sub->rtp);
-		break;
-	case AST_CONTROL_PROGRESS:
-	case AST_CONTROL_PROCEEDING:
-		transmit_modify_request(sub);
-	case -1:
-		transmit_notify_request(sub, "");
-		break;
-	default:
-		ast_log(LOG_WARNING, "Don't know how to indicate condition %d\n", ind);
-		/* fallthrough */
-	case AST_CONTROL_PVT_CAUSE_CODE:
-		res = -1;
-	}
-	ast_mutex_unlock(&sub->lock);
-	return res;
-}
-
-static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor)
-{
-	struct ast_format_cap *caps = NULL;
-	struct ast_channel *tmp;
-	struct ast_variable *v = NULL;
-	struct mgcp_endpoint *i = sub->parent;
-	struct ast_format *tmpfmt;
-
-	caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-	if (!caps) {
-		ast_log(LOG_ERROR, "Format capabilities could not be created\n");
-		return NULL;
-	}
-	tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, assignedids, requestor, i->amaflags, "MGCP/%s@%s-%d", i->name, i->parent->name, sub->id);
-	if (!tmp) {
-		ast_log(LOG_WARNING, "Channel could not be created\n");
-		ao2_ref(caps, -1);
-		return NULL;
-	}
-
-	ast_channel_stage_snapshot(tmp);
-	ast_channel_tech_set(tmp, &mgcp_tech);
-	if (ast_format_cap_count(i->cap)) {
-		ast_format_cap_append_from_cap(caps, i->cap, AST_MEDIA_TYPE_UNKNOWN);
-	} else {
-		ast_format_cap_append_from_cap(caps, global_capability, AST_MEDIA_TYPE_UNKNOWN);
-	}
-	ast_channel_nativeformats_set(tmp, caps);
-	ao2_ref(caps, -1);
-	if (sub->rtp) {
-		ast_channel_set_fd(tmp, 0, ast_rtp_instance_fd(sub->rtp, 0));
-	}
-	if (i->dtmfmode & (MGCP_DTMF_INBAND | MGCP_DTMF_HYBRID)) {
-		i->dsp = ast_dsp_new();
-		ast_dsp_set_features(i->dsp, DSP_FEATURE_DIGIT_DETECT);
-		/* this is to prevent clipping of dtmf tones during dsp processing */
-		ast_dsp_set_digitmode(i->dsp, DSP_DIGITMODE_NOQUELCH);
-	} else {
-		i->dsp = NULL;
-	}
-	if (state == AST_STATE_RING) {
-		ast_channel_rings_set(tmp, 1);
-	}
-
-	tmpfmt = ast_format_cap_get_format(ast_channel_nativeformats(tmp), 0);
-	ast_channel_set_writeformat(tmp, tmpfmt);
-	ast_channel_set_rawwriteformat(tmp, tmpfmt);
-	ast_channel_set_readformat(tmp, tmpfmt);
-	ast_channel_set_rawreadformat(tmp, tmpfmt);
-	ao2_ref(tmpfmt, -1);
-	ast_channel_tech_pvt_set(tmp, sub);
-	if (!ast_strlen_zero(i->language))
-		ast_channel_language_set(tmp, i->language);
-	if (!ast_strlen_zero(i->accountcode))
-		ast_channel_accountcode_set(tmp, i->accountcode);
-	if (i->amaflags)
-		ast_channel_amaflags_set(tmp, i->amaflags);
-	mgcp_set_owner(sub, tmp);
-	ast_module_ref(ast_module_info->self);
-	ast_channel_callgroup_set(tmp, i->callgroup);
-	ast_channel_pickupgroup_set(tmp, i->pickupgroup);
-	ast_channel_call_forward_set(tmp, i->call_forward);
-	ast_channel_context_set(tmp, i->context);
-	ast_channel_exten_set(tmp, i->exten);
-	/* Don't use ast_set_callerid() here because it will
-	 * generate a needless NewCallerID event */
-	if (!ast_strlen_zero(i->cid_num)) {
-		ast_channel_caller(tmp)->ani.number.valid = 1;
-		ast_channel_caller(tmp)->ani.number.str = ast_strdup(i->cid_num);
-	}
-
-	if (!i->adsi) {
-		ast_channel_adsicpe_set(tmp, AST_ADSI_UNAVAILABLE);
-	}
-	ast_channel_priority_set(tmp, 1);
-
-	/* Set channel variables for this call from configuration */
-	for (v = i->chanvars ; v ; v = v->next) {
-		char valuebuf[1024];
-		pbx_builtin_setvar_helper(tmp, v->name, ast_get_encoded_str(v->value, valuebuf, sizeof(valuebuf)));
-	}
-
-	if (sub->rtp) {
-		ast_jb_configure(tmp, &global_jbconf);
-	}
-
-	ast_channel_stage_snapshot_done(tmp);
-	ast_channel_unlock(tmp);
-
-	if (state != AST_STATE_DOWN) {
-		if (ast_pbx_start(tmp)) {
-			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp));
-			ast_hangup(tmp);
-			tmp = NULL;
-		}
-	}
-	ast_verb(3, "MGCP mgcp_new(%s) created in state: %s\n",
-			ast_channel_name(tmp), ast_state2str(state));
-
-	return tmp;
-}
-
-static char *get_sdp_by_line(char* line, char *name, int nameLen)
-{
-	if (strncasecmp(line, name, nameLen) == 0 && line[nameLen] == '=') {
-		char *r = line + nameLen + 1;
-		while (*r && (*r < 33)) ++r;
-		return r;
-	}
-	return "";
-}
-
-static char *get_sdp(struct mgcp_request *req, char *name)
-{
-	int x;
-	int len = strlen(name);
-	char *r;
-
-	for (x = 0; x < req->lines; x++) {
-		r = get_sdp_by_line(req->line[x], name, len);
-		if (r[0] != '\0') return r;
-	}
-	return "";
-}
-
-static void sdpLineNum_iterator_init(int *iterator)
-{
-	*iterator = 0;
-}
-
-static char *get_sdp_iterate(int* iterator, struct mgcp_request *req, char *name)
-{
-	int len = strlen(name);
-	char *r;
-	while (*iterator < req->lines) {
-		r = get_sdp_by_line(req->line[(*iterator)++], name, len);
-		if (r[0] != '\0') return r;
-	}
-	return "";
-}
-
-static char *__get_header(struct mgcp_request *req, char *name, int *start, char *def)
-{
-	int x;
-	int len = strlen(name);
-	char *r;
-	for (x = *start; x < req->headers; x++) {
-		if (!strncasecmp(req->header[x], name, len) &&
-		    (req->header[x][len] == ':')) {
-			r = req->header[x] + len + 1;
-			while (*r && (*r < 33)) {
-				r++;
-			}
-			*start = x + 1;
-			return r;
-		}
-	}
-	/* Don't return NULL, so get_header is always a valid pointer */
-	return def;
-}
-
-static char *get_header(struct mgcp_request *req, char *name)
-{
-	int start = 0;
-	return __get_header(req, name, &start, "");
-}
-
-/*! \brief get_csv: (SC:) get comma separated value */
-static char *get_csv(char *c, int *len, char **next)
-{
-	char *s;
-
-	*next = NULL, *len = 0;
-	if (!c) return NULL;
-
-	while (*c && (*c < 33 || *c == ',')) {
-		c++;
-	}
-
-	s = c;
-	while (*c && (*c >= 33 && *c != ',')) {
-		c++, (*len)++;
-	}
-	*next = c;
-
-	if (*len == 0) {
-		s = NULL, *next = NULL;
-	}
-
-	return s;
-}
-
-static struct mgcp_gateway *find_realtime_gw(char *name, char *at, struct sockaddr_in *sin)
-{
-	struct mgcp_gateway *g = NULL;
-	struct ast_variable *mgcpgwconfig = NULL;
-	struct ast_variable *gwv, *epname = NULL;
-	struct mgcp_endpoint *e;
-	char lines[256];
-	int i, j;
-
-	ast_debug(1, "*** find Realtime MGCPGW\n");
-
-	if (!(i = ast_check_realtime("mgcpgw")) || !(j = ast_check_realtime("mgcpep"))) {
-		return NULL;
-	}
-
-	if (ast_strlen_zero(at)) {
-		ast_debug(1, "null gw name\n");
-		return NULL;
-	}
-
-	if (!(mgcpgwconfig = ast_load_realtime("mgcpgw", "name", at, NULL))) {
-		return NULL;
-	}
-
-	/*!
-	 * \note This is a fairly odd way of instantiating lines.  Instead of each
-	 * line created by virtue of being in the database (and loaded via
-	 * ast_load_realtime_multientry), this code forces a specific order with a
-	 * "lines" entry in the "mgcpgw" record.  This has benefits, because as with
-	 * chan_dahdi, values are inherited across definitions.  The downside is
-	 * that it's not as clear what the values will be simply by looking at a
-	 * single row in the database, and it's probable that the sanest configuration
-	 * should have the first column in the "mgcpep" table be "clearvars", with a
-	 * static value of "all", if any variables are set at all.  It may be worth
-	 * making this assumption explicit in the code in the future, and then just
-	 * using ast_load_realtime_multientry for the "mgcpep" records.
-	 */
-	lines[0] = '\0';
-	for (gwv = mgcpgwconfig; gwv; gwv = gwv->next) {
-		if (!strcasecmp(gwv->name, "lines")) {
-			ast_copy_string(lines, gwv->value, sizeof(lines));
-			break;
-		}
-	}
-	/* Position gwv at the end of the list */
-	for (gwv = gwv && gwv->next ? gwv : mgcpgwconfig; gwv->next; gwv = gwv->next);
-
-	if (!ast_strlen_zero(lines)) {
-		AST_DECLARE_APP_ARGS(args,
-			AST_APP_ARG(line)[100];
-		);
-		AST_STANDARD_APP_ARGS(args, lines);
-		for (i = 0; i < args.argc; i++) {
-			gwv->next = ast_load_realtime("mgcpep", "name", at, "line", args.line[i], NULL);
-
-			/* Remove "line" AND position gwv at the end of the list. */
-			for (epname = NULL; gwv->next; gwv = gwv->next) {
-				if (!strcasecmp(gwv->next->name, "line")) {
-					/* Remove it from the list */
-					epname = gwv->next;
-					gwv->next = gwv->next->next;
-				}
-			}
-			/* Since "line" instantiates the configuration, we have to move it to the end. */
-			if (epname) {
-				gwv->next = epname;
-				epname->next = NULL;
-				gwv = gwv->next;
-			}
-		}
-	}
-	for (gwv = mgcpgwconfig; gwv; gwv = gwv->next) {
-		ast_debug(1, "MGCP Realtime var: %s => %s\n", gwv->name, gwv->value);
-	}
-
-	if (mgcpgwconfig) {
-		g = build_gateway(at, mgcpgwconfig);
-		ast_variables_destroy(mgcpgwconfig);
-	}
-	if (g) {
-		g->next = gateways;
-		g->realtime = 1;
-		gateways = g;
-		for (e = g->endpoints; e; e = e->next) {
-			transmit_audit_endpoint(e);
-			e->needaudit = 0;
-		}
-	}
-	return g;
-}
-
-static struct mgcp_subchannel *find_subchannel_and_lock(char *name, int msgid, struct sockaddr_in *sin)
-{
-	struct mgcp_endpoint *p = NULL;
-	struct mgcp_subchannel *sub = NULL;
-	struct mgcp_gateway *g;
-	char tmp[256] = "";
-	char *at = NULL, *c;
-	int found = 0;
-	if (name) {
-		ast_copy_string(tmp, name, sizeof(tmp));
-		at = strchr(tmp, '@');
-		if (!at) {
-			ast_log(LOG_NOTICE, "Endpoint '%s' has no at sign!\n", name);
-			return NULL;
-		}
-		*at++ = '\0';
-	}
-	ast_mutex_lock(&gatelock);
-	if (at && (at[0] == '[')) {
-		at++;
-		c = strrchr(at, ']');
-		if (c) {
-			*c = '\0';
-		}
-	}
-	for (g = gateways ? gateways : find_realtime_gw(name, at, sin); g; g = g->next ? g->next : find_realtime_gw(name, at, sin)) {
-		if ((!name || !strcasecmp(g->name, at)) &&
-		    (sin || g->addr.sin_addr.s_addr || g->defaddr.sin_addr.s_addr)) {
-			/* Found the gateway.  If it's dynamic, save it's address -- now for the endpoint */
-			if (sin && g->dynamic && name) {
-				if ((g->addr.sin_addr.s_addr != sin->sin_addr.s_addr) ||
-					(g->addr.sin_port != sin->sin_port)) {
-					memcpy(&g->addr, sin, sizeof(g->addr));
-					{
-						struct ast_sockaddr tmp1, tmp2;
-						struct sockaddr_in tmp3 = {0,};
-
-						tmp3.sin_addr = g->ourip;
-						ast_sockaddr_from_sin(&tmp1, &g->addr);
-						ast_sockaddr_from_sin(&tmp2, &tmp3);
-						if (ast_ouraddrfor(&tmp1, &tmp2)) {
-							memcpy(&g->ourip, &__ourip, sizeof(g->ourip));
-						}
-						ast_sockaddr_to_sin(&tmp2, &tmp3);
-						g->ourip = tmp3.sin_addr;
-					}
-					ast_verb(3, "Registered MGCP gateway '%s' at %s port %d\n", g->name, ast_inet_ntoa(g->addr.sin_addr), ntohs(g->addr.sin_port));
-				}
-			/* not dynamic, check if the name matches */
-			} else if (name) {
-				if (strcasecmp(g->name, at)) {
-					continue;
-				}
-			/* not dynamic, no name, check if the addr matches */
-			} else if (!name && sin) {
-				if ((g->addr.sin_addr.s_addr != sin->sin_addr.s_addr) ||
-				    (g->addr.sin_port != sin->sin_port)) {
-					continue;
-				}
-			} else {
-				continue;
-			}
-			for (p = g->endpoints; p; p = p->next) {
-				ast_debug(1, "Searching on %s@%s for subchannel\n", p->name, g->name);
-				if (msgid) {
-					sub = p->sub;
-					found = 1;
-					break;
-				} else if (name && !strcasecmp(p->name, tmp)) {
-					ast_debug(1, "Coundn't determine subchannel, assuming current master %s@%s-%d\n",
-						p->name, g->name, p->sub->id);
-					sub = p->sub;
-					found = 1;
-					break;
-				}
-			}
-			if (sub && found) {
-				ast_mutex_lock(&sub->lock);
-				break;
-			}
-		}
-	}
-	ast_mutex_unlock(&gatelock);
-	if (!sub) {
-		if (name) {
-			if (g) {
-				ast_log(LOG_NOTICE, "Endpoint '%s' not found on gateway '%s'\n", tmp, at);
-			} else {
-				ast_log(LOG_NOTICE, "Gateway '%s' (and thus its endpoint '%s') does not exist\n", at, tmp);
-			}
-		}
-	}
-	return sub;
-}
-
-static void parse(struct mgcp_request *req)
-{
-	/* Divide fields by NULL's */
-	char *c;
-	int f = 0;
-	c = req->data;
-
-	/* First header starts immediately */
-	req->header[f] = c;
-	for (; *c; c++) {
-		if (*c == '\n') {
-			/* We've got a new header */
-			*c = 0;
-			ast_debug(3, "Header: %s (%d)\n", req->header[f], (int) strlen(req->header[f]));
-			if (ast_strlen_zero(req->header[f])) {
-				/* Line by itself means we're now in content */
-				c++;
-				break;
-			}
-			if (f >= MGCP_MAX_HEADERS - 1) {
-				ast_log(LOG_WARNING, "Too many MGCP headers...\n");
-			} else {
-				f++;
-			}
-			req->header[f] = c + 1;
-		} else if (*c == '\r') {
-			/* Ignore but eliminate \r's */
-			*c = 0;
-		}
-	}
-	/* Check for last header */
-	if (!ast_strlen_zero(req->header[f])) {
-		f++;
-	}
-	req->headers = f;
-	/* Now we process any mime content */
-	f = 0;
-	req->line[f] = c;
-	for (; *c; c++) {
-		if (*c == '\n') {
-			/* We've got a new line */
-			*c = 0;
-			ast_debug(3, "Line: %s (%d)\n", req->line[f], (int) strlen(req->line[f]));
-			if (f >= MGCP_MAX_LINES - 1) {
-				ast_log(LOG_WARNING, "Too many SDP lines...\n");
-			} else {
-				f++;
-			}
-			req->line[f] = c + 1;
-		} else if (*c == '\r') {
-			/* Ignore and eliminate \r's */
-			*c = 0;
-		}
-	}
-	/* Check for last line */
-	if (!ast_strlen_zero(req->line[f])) {
-		f++;
-	}
-	req->lines = f;
-	/* Parse up the initial header */
-	c = req->header[0];
-	while (*c && *c < 33) c++;
-	/* First the verb */
-	req->verb = c;
-	while (*c && (*c > 32)) c++;
-	if (*c) {
-		*c = '\0';
-		c++;
-		while (*c && (*c < 33)) c++;
-		req->identifier = c;
-		while (*c && (*c > 32)) c++;
-		if (*c) {
-			*c = '\0';
-			c++;
-			while (*c && (*c < 33)) c++;
-			req->endpoint = c;
-			while (*c && (*c > 32)) c++;
-			if (*c) {
-				*c = '\0';
-				c++;
-				while (*c && (*c < 33)) c++;
-				req->version = c;
-				while (*c && (*c > 32)) c++;
-				while (*c && (*c < 33)) c++;
-				while (*c && (*c > 32)) c++;
-				*c = '\0';
-			}
-		}
-	}
-
-	ast_debug(1, "Verb: '%s', Identifier: '%s', Endpoint: '%s', Version: '%s'\n",
-			req->verb, req->identifier, req->endpoint, req->version);
-	ast_debug(1, "%d headers, %d lines\n", req->headers, req->lines);
-	if (*c) {
-		ast_log(LOG_WARNING, "Odd content, extra stuff left over ('%s')\n", c);
-	}
-}
-
-static int process_sdp(struct mgcp_subchannel *sub, struct mgcp_request *req)
-{
-	char *m;
-	char *c;
-	char *a;
-	char host[258];
-	int len = 0;
-	int portno;
-	struct ast_format_cap *peercap;
-	int peerNonCodecCapability;
-	struct ast_sockaddr addr = { {0,} };
-	char *codecs;
-	int codec, codec_count=0;
-	int iterator;
-	struct mgcp_endpoint *p = sub->parent;
-	struct ast_str *global_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
-	struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
-	struct ast_str *pvt_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
-
-	/* Get codec and RTP info from SDP */
-	m = get_sdp(req, "m");
-	c = get_sdp(req, "c");
-	if (ast_strlen_zero(m) || ast_strlen_zero(c)) {
-		ast_log(LOG_WARNING, "Insufficient information for SDP (m = '%s', c = '%s')\n", m, c);
-		return -1;
-	}
-	if (sscanf(c, "IN IP4 %256s", host) != 1) {
-		ast_log(LOG_WARNING, "Invalid host in c= line, '%s'\n", c);
-		return -1;
-	}
-	/* XXX This could block for a long time, and block the main thread! XXX */
-	if (ast_sockaddr_resolve_first_af(&addr, host, PARSE_PORT_FORBID, AF_INET)) {
-		ast_log(LOG_WARNING, "Unable to lookup host in c= line, '%s'\n", c);
-		return -1;
-	}
-	if (sscanf(m, "audio %30d RTP/AVP %n", &portno, &len) != 1 || !len) {
-		ast_log(LOG_WARNING, "Malformed media stream descriptor: %s\n", m);
-		return -1;
-	}
-	ast_sockaddr_set_port(&addr, portno);
-	ast_rtp_instance_set_remote_address(sub->rtp, &addr);
-	ast_debug(3, "Peer RTP is at port %s\n", ast_sockaddr_stringify(&addr));
-	/* Scan through the RTP payload types specified in a "m=" line: */
-	codecs = ast_strdupa(m + len);
-	while (!ast_strlen_zero(codecs)) {
-		if (sscanf(codecs, "%30d%n", &codec, &len) != 1) {
-			if (codec_count) {
-				break;
-			}
-			ast_log(LOG_WARNING, "Error in codec string '%s' at '%s'\n", m, codecs);
-			return -1;
-		}
-		ast_rtp_codecs_payloads_set_m_type(ast_rtp_instance_get_codecs(sub->rtp), sub->rtp, codec);
-		codec_count++;
-		codecs += len;
-	}
-
-	/* Next, scan through each "a=rtpmap:" line, noting each */
-	/* specified RTP payload type (with corresponding MIME subtype): */
-	sdpLineNum_iterator_init(&iterator);
-	while ((a = get_sdp_iterate(&iterator, req, "a"))[0] != '\0') {
-		char* mimeSubtype = ast_strdupa(a); /* ensures we have enough space */
-		if (sscanf(a, "rtpmap: %30d %127[^/]/", &codec, mimeSubtype) != 2)
-			continue;
-		/* Note: should really look at the 'freq' and '#chans' params too */
-		ast_rtp_codecs_payloads_set_rtpmap_type(ast_rtp_instance_get_codecs(sub->rtp), sub->rtp, codec, "audio", mimeSubtype, 0);
-	}
-
-	/* Now gather all of the codecs that were asked for: */
-	if (!(peercap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
-		return -1;
-	}
-	ast_rtp_codecs_payload_formats(ast_rtp_instance_get_codecs(sub->rtp), peercap, &peerNonCodecCapability);
-	ast_format_cap_get_compatible(global_capability, peercap, p->cap);
-	ast_debug(1, "Capabilities: us - %s, them - %s, combined - %s\n",
-		ast_format_cap_get_names(global_capability, &global_buf),
-		ast_format_cap_get_names(peercap, &peer_buf),
-		ast_format_cap_get_names(p->cap, &pvt_buf));
-	ao2_ref(peercap, -1);
-
-	ast_debug(1, "Non-codec capabilities: us - %d, them - %d, combined - %d\n",
-		nonCodecCapability, peerNonCodecCapability, p->nonCodecCapability);
-	if (!ast_format_cap_count(p->cap)) {
-		ast_log(LOG_WARNING, "No compatible codecs!\n");
-		return -1;
-	}
-	return 0;
-}
-
-static int add_header(struct mgcp_request *req, const char *var, const char *value)
-{
-	if (req->len >= sizeof(req->data) - 4) {
-		ast_log(LOG_WARNING, "Out of space, can't add anymore\n");
-		return -1;
-	}
-	if (req->lines) {
-		ast_log(LOG_WARNING, "Can't add more headers when lines have been added\n");
-		return -1;
-	}
-	req->header[req->headers] = req->data + req->len;
-	snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s: %s\r\n", var, value);
-	req->len += strlen(req->header[req->headers]);
-	if (req->headers < MGCP_MAX_HEADERS) {
-		req->headers++;
-	} else {
-		ast_log(LOG_WARNING, "Out of header space\n");
-		return -1;
-	}
-	return 0;
-}
-
-static int add_line(struct mgcp_request *req, char *line)
-{
-	if (req->len >= sizeof(req->data) - 4) {
-		ast_log(LOG_WARNING, "Out of space, can't add anymore\n");
-		return -1;
-	}
-	if (!req->lines) {
-		/* Add extra empty return */
-		ast_copy_string(req->data + req->len, "\r\n", sizeof(req->data) - req->len);
-		req->len += strlen(req->data + req->len);
-	}
-	req->line[req->lines] = req->data + req->len;
-	snprintf(req->line[req->lines], sizeof(req->data) - req->len, "%s", line);
-	req->len += strlen(req->line[req->lines]);
-	if (req->lines < MGCP_MAX_LINES) {
-		req->lines++;
-	} else {
-		ast_log(LOG_WARNING, "Out of line space\n");
-		return -1;
-	}
-	return 0;
-}
-
-static int init_resp(struct mgcp_request *req, char *resp, struct mgcp_request *orig, char *resprest)
-{
-	/* Initialize a response */
-	if (req->headers || req->len) {
-		ast_log(LOG_WARNING, "Request already initialized?!?\n");
-		return -1;
-	}
-	req->header[req->headers] = req->data + req->len;
-	snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %s %s\r\n", resp, orig->identifier, resprest);
-	req->len += strlen(req->header[req->headers]);
-	if (req->headers < MGCP_MAX_HEADERS) {
-		req->headers++;
-	} else {
-		ast_log(LOG_WARNING, "Out of header space\n");
-	}
-	return 0;
-}
-
-static int init_req(struct mgcp_endpoint *p, struct mgcp_request *req, char *verb, unsigned int oseq)
-{
-	/* Initialize a response */
-	if (req->headers || req->len) {
-		ast_log(LOG_WARNING, "Request already initialized?!?\n");
-		return -1;
-	}
-	req->header[req->headers] = req->data + req->len;
-	/* check if we need brackets around the gw name */
-	if (p->parent->isnamedottedip) {
-		snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %u %s@[%s] MGCP 1.0%s\r\n", verb, oseq, p->name, p->parent->name, p->ncs ? " NCS 1.0" : "");
-	} else {
-+		snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %u %s@%s MGCP 1.0%s\r\n", verb, oseq, p->name, p->parent->name, p->ncs ? " NCS 1.0" : "");
-	}
-	req->len += strlen(req->header[req->headers]);
-	if (req->headers < MGCP_MAX_HEADERS) {
-		req->headers++;
-	} else {
-		ast_log(LOG_WARNING, "Out of header space\n");
-	}
-	return 0;
-}
-
-
-static int respprep(struct mgcp_request *resp, struct mgcp_endpoint *p, char *msg, struct mgcp_request *req, char *msgrest)
-{
-	memset(resp, 0, sizeof(*resp));
-	init_resp(resp, msg, req, msgrest);
-	return 0;
-}
-
-static int reqprep(struct mgcp_request *req, struct mgcp_endpoint *p, char *verb)
-{
-	unsigned int oseq;
-	memset(req, 0, sizeof(struct mgcp_request));
-	ast_mutex_lock(&oseq_lock);
-	oseq_global++;
-	if (oseq_global > 999999999) {
-		oseq_global = 1;
-	}
-	oseq = oseq_global;
-	ast_mutex_unlock(&oseq_lock);
-	init_req(p, req, verb, oseq);
-	return oseq;
-}
-
-static int transmit_response(struct mgcp_subchannel *sub, char *msg, struct mgcp_request *req, char *msgrest)
-{
-	struct mgcp_request resp;
-	struct mgcp_endpoint *p = sub->parent;
-	struct mgcp_response *mgr;
-
-	if (!sub) {
-		return -1;
-	}
-
-	respprep(&resp, p, msg, req, msgrest);
-	if (!(mgr = ast_calloc(1, sizeof(*mgr) + resp.len + 1))) {
-		return send_response(sub, &resp);
-	}
-	/* Store MGCP response in case we have to retransmit */
-	sscanf(req->identifier, "%30d", &mgr->seqno);
-	time(&mgr->whensent);
-	mgr->len = resp.len;
-	memcpy(mgr->buf, resp.data, resp.len);
-	mgr->buf[resp.len] = '\0';
-	mgr->next = p->parent->responses;
-	p->parent->responses = mgr;
-
-	return send_response(sub, &resp);
-}
-
-
-static int add_sdp(struct mgcp_request *resp, struct mgcp_subchannel *sub, struct ast_rtp_instance *rtp)
-{
-	int len;
-	int codec;
-	char costr[80];
-	struct sockaddr_in sin;
-	struct ast_sockaddr sin_tmp;
-	char v[256];
-	char s[256];
-	char o[256];
-	char c[256];
-	char t[256];
-	char m[256] = "";
-	char a[1024] = "";
-	int x;
-	struct sockaddr_in dest = { 0, };
-	struct ast_sockaddr dest_tmp;
-	struct mgcp_endpoint *p = sub->parent;
-	/* XXX We break with the "recommendation" and send our IP, in order that our
-	       peer doesn't have to ast_gethostbyname() us XXX */
-	len = 0;
-	if (!sub->rtp) {
-		ast_log(LOG_WARNING, "No way to add SDP without an RTP structure\n");
-		return -1;
-	}
-	ast_rtp_instance_get_local_address(sub->rtp, &sin_tmp);
-	ast_sockaddr_to_sin(&sin_tmp, &sin);
-	if (rtp) {
-		ast_rtp_instance_get_remote_address(sub->rtp, &dest_tmp);
-		ast_sockaddr_to_sin(&dest_tmp, &dest);
-	} else {
-		if (sub->tmpdest.sin_addr.s_addr) {
-			dest.sin_addr = sub->tmpdest.sin_addr;
-			dest.sin_port = sub->tmpdest.sin_port;
-			/* Reset temporary destination */
-			memset(&sub->tmpdest, 0, sizeof(sub->tmpdest));
-		} else {
-			dest.sin_addr = p->parent->ourip;
-			dest.sin_port = sin.sin_port;
-		}
-	}
-	ast_debug(1, "We're at %s port %d\n", ast_inet_ntoa(p->parent->ourip), ntohs(sin.sin_port));
-	ast_copy_string(v, "v=0\r\n", sizeof(v));
-	snprintf(o, sizeof(o), "o=root %d %d IN IP4 %s\r\n", (int)getpid(), (int)getpid(), ast_inet_ntoa(dest.sin_addr));
-	ast_copy_string(s, "s=session\r\n", sizeof(s));
-	snprintf(c, sizeof(c), "c=IN IP4 %s\r\n", ast_inet_ntoa(dest.sin_addr));
-	ast_copy_string(t, "t=0 0\r\n", sizeof(t));
-	snprintf(m, sizeof(m), "m=audio %d RTP/AVP", ntohs(dest.sin_port));
-
-	for (x = 0; x < ast_format_cap_count(p->cap); x++) {
-		struct ast_format *format = ast_format_cap_get_format(p->cap, x);
-
-		if (ast_format_get_type(format) != AST_MEDIA_TYPE_AUDIO) {
-			ao2_ref(format, -1);
-			continue;
-		}
-
-		ast_debug(1, "Answering with capability %s\n", ast_format_get_name(format));
-		codec = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(sub->rtp), 1, format, 0);
-		if (codec > -1) {
-			snprintf(costr, sizeof(costr), " %d", codec);
-			strncat(m, costr, sizeof(m) - strlen(m) - 1);
-			snprintf(costr, sizeof(costr), "a=rtpmap:%d %s/8000\r\n", codec, ast_rtp_lookup_mime_subtype2(1, format, 0, 0));
-			strncat(a, costr, sizeof(a) - strlen(a) - 1);
-		}
-
-		ao2_ref(format, -1);
-	}
-
-	for (x = 1LL; x <= AST_RTP_MAX; x <<= 1) {
-		if (p->nonCodecCapability & x) {
-			ast_debug(1, "Answering with non-codec capability %d\n", (int) x);
-			codec = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(sub->rtp), 0, NULL, x);
-			if (codec > -1) {
-				snprintf(costr, sizeof(costr), " %d", codec);
-				strncat(m, costr, sizeof(m) - strlen(m) - 1);
-				snprintf(costr, sizeof(costr), "a=rtpmap:%d %s/8000\r\n", codec, ast_rtp_lookup_mime_subtype2(0, NULL, x, 0));
-				strncat(a, costr, sizeof(a) - strlen(a) - 1);
-				if (x == AST_RTP_DTMF) {
-					/* Indicate we support DTMF...  Not sure about 16,
-					   but MSN supports it so dang it, we will too... */
-					snprintf(costr, sizeof costr, "a=fmtp:%d 0-16\r\n", codec);
-					strncat(a, costr, sizeof(a) - strlen(a) - 1);
-				}
-			}
-		}
-	}
-	strncat(m, "\r\n", sizeof(m) - strlen(m) - 1);
-	len = strlen(v) + strlen(s) + strlen(o) + strlen(c) + strlen(t) + strlen(m) + strlen(a);
-	snprintf(costr, sizeof(costr), "%d", len);
-	add_line(resp, v);
-	add_line(resp, o);
-	add_line(resp, s);
-	add_line(resp, c);
-	add_line(resp, t);
-	add_line(resp, m);
-	add_line(resp, a);
-	return 0;
-}
-
-static int transmit_modify_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp_instance *rtp, const struct ast_format_cap *codecs)
-{
-	struct mgcp_request resp;
-	char local[256];
-	char tmp[80];
-	struct mgcp_endpoint *p = sub->parent;
-	int i;
-	struct ast_sockaddr sub_tmpdest_tmp;
-	unsigned int oseq;
-
-	if (ast_strlen_zero(sub->cxident) && rtp) {
-		/* We don't have a CXident yet, store the destination and
-		   wait a bit */
-		ast_rtp_instance_get_remote_address(rtp, &sub_tmpdest_tmp);
-		ast_sockaddr_to_sin(&sub_tmpdest_tmp, &sub->tmpdest);
-		return 0;
-	}
-	ast_copy_string(local, "e:on, s:off, p:20", sizeof(local));
-
-	for (i = 0; i < ast_format_cap_count(p->cap); i++) {
-		struct ast_format *format = ast_format_cap_get_format(p->cap, i);
-
-		if (ast_format_get_type(format) != AST_MEDIA_TYPE_AUDIO) {
-			ao2_ref(format, -1);
-			continue;
-		}
-
-		snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, format, 0, 0));
-		strncat(local, tmp, sizeof(local) - strlen(local) - 1);
-
-		ao2_ref(format, -1);
-	}
-
-	if (sub->gate) {
-		if (sub->gate->state == GATE_ALLOCATED || sub->gate->state == GATE_OPEN) {
-			snprintf(tmp, sizeof(tmp), ", dq-gi:%x", sub->gate->gateid);
-			strncat(local, tmp, sizeof(local) - strlen(local) - 1);
-			sub->sdpsent = 1;
-		} else {
-			/* oops wait */
-			ast_debug(1, "Waiting for opened gate...\n");
-			sub->sdpsent = 0;
-			return 0;
-		}
-	}
-
-
-	oseq = reqprep(&resp, p, "MDCX");
-	add_header(&resp, "C", sub->callid);
-	add_header(&resp, "L", local);
-	add_header(&resp, "M", mgcp_cxmodes[sub->cxmode]);
-	/* X header should not be sent. kept for compatibility */
-	add_header(&resp, "X", sub->txident);
-	add_header(&resp, "I", sub->cxident);
-	/*add_header(&resp, "S", "");*/
-	add_sdp(&resp, sub, rtp);
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_MDCX;
-	resp.trid = oseq;
-	return send_request(p, sub, &resp, oseq);
-}
-
-static int transmit_connect_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp_instance *rtp)
-{
-	struct mgcp_request resp;
-	char local[256];
-	char tmp[80];
-	int i;
-	struct mgcp_endpoint *p = sub->parent;
-	unsigned int oseq;
-
-	ast_debug(3, "Creating connection for %s@%s-%d in cxmode: %s callid: %s\n",
-		 p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid);
-
-	ast_copy_string(local, "e:on, s:off, p:20", sizeof(local));
-
-	for (i = 0; i < ast_format_cap_count(p->cap); i++) {
-		struct ast_format *format = ast_format_cap_get_format(p->cap, i);
-
-		if (ast_format_get_type(format) != AST_MEDIA_TYPE_AUDIO) {
-			ao2_ref(format, -1);
-			continue;
-		}
-
-		snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, format, 0, 0));
-		strncat(local, tmp, sizeof(local) - strlen(local) - 1);
-
-		ao2_ref(format, -1);
-	}
-
-	if (sub->gate) {
-		if(sub->gate->state == GATE_ALLOCATED) {
-			snprintf(tmp, sizeof(tmp), ", dq-gi:%x", sub->gate->gateid);
-			strncat(local, tmp, sizeof(local) - strlen(local) - 1);
-		}
-	}
-	sub->sdpsent = 1;
-	oseq = reqprep(&resp, p, "CRCX");
-	add_header(&resp, "C", sub->callid);
-	add_header(&resp, "L", local);
-	add_header(&resp, "M", mgcp_cxmodes[sub->cxmode]);
-	/* X header should not be sent. kept for compatibility */
-	add_header(&resp, "X", sub->txident);
-	/*add_header(&resp, "S", "");*/
-	add_sdp(&resp, sub, rtp);
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_CRCX;
-	resp.trid = oseq;
-	return send_request(p, sub, &resp, oseq);
-}
-
-static int mgcp_pktcgate_remove(struct cops_gate *gate)
-{
-	struct mgcp_subchannel *sub = gate->tech_pvt;
-
-	if (!sub) {
-		return 1;
-	}
-
-	ast_mutex_lock(&sub->lock);
-	ast_debug(1, "Pktc: gate 0x%x deleted\n", gate->gateid);
-	if (sub->gate->state != GATE_CLOSED && sub->parent->hangupongateremove) {
-		sub->gate = NULL;
-		if (sub->owner) {
-			ast_softhangup(sub->owner, AST_CAUSE_REQUESTED_CHAN_UNAVAIL);
-			ast_channel_unlock(sub->owner);
-		}
-	} else {
-		sub->gate = NULL;
-	}
-	ast_mutex_unlock(&sub->lock);
-	return 1;
-}
-
-static int mgcp_pktcgate_open(struct cops_gate *gate)
-{
-	struct mgcp_subchannel *sub = gate->tech_pvt;
-	if (!sub) {
-		return 1;
-	}
-	ast_mutex_lock(&sub->lock);
-	ast_debug(1, "Pktc: gate 0x%x open\n", gate->gateid);
-	if (!sub->sdpsent) transmit_modify_with_sdp(sub, NULL, 0);
-	ast_mutex_unlock(&sub->lock);
-	return 1;
-}
-
-static int mgcp_alloc_pktcgate(struct mgcp_subchannel *sub)
-{
-	struct mgcp_endpoint *p = sub->parent;
-	sub->gate = ast_pktccops_gate_alloc(GATE_SET, NULL, ntohl(p->parent->addr.sin_addr.s_addr),
-					8, 128000, 232, 0, 0, NULL, &mgcp_pktcgate_remove);
-
-	if (!sub->gate) {
-		return 0;
-	}
-	sub->gate->tech_pvt = sub;
-	sub->gate->gate_open = &mgcp_pktcgate_open;
-	return 1;
-}
-
-static int transmit_connect(struct mgcp_subchannel *sub)
-{
-	struct mgcp_request resp;
-	int x;
-	char local[256];
-	char tmp[80];
-	struct ast_format *tmpfmt;
-	struct mgcp_endpoint *p = sub->parent;
-	unsigned int oseq;
-
-	ast_copy_string(local, "p:20, s:off, e:on", sizeof(local));
-
-	for (x = 0; x < ast_format_cap_count(p->cap); x++) {
-		tmpfmt = ast_format_cap_get_format(p->cap, x);
-
-		snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, tmpfmt, 0, 0));
-		strncat(local, tmp, sizeof(local) - strlen(local) - 1);
-
-		ao2_ref(tmpfmt, -1);
-	}
-
-	ast_debug(3, "Creating connection for %s@%s-%d in cxmode: %s callid: %s\n",
-		    p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid);
-	sub->sdpsent = 0;
-	oseq = reqprep(&resp, p, "CRCX");
-	add_header(&resp, "C", sub->callid);
-	add_header(&resp, "L", local);
-	add_header(&resp, "M", "inactive");
-	/* X header should not be sent. kept for compatibility */
-	add_header(&resp, "X", sub->txident);
-	/*add_header(&resp, "S", "");*/
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_CRCX;
-	resp.trid = oseq;
-	return send_request(p, sub, &resp, oseq);
-}
-
-static int transmit_notify_request(struct mgcp_subchannel *sub, char *tone)
-{
-	struct mgcp_request resp;
-	struct mgcp_endpoint *p = sub->parent;
-	unsigned int oseq;
-
-	ast_debug(3, "MGCP Asked to indicate tone: %s on  %s@%s-%d in cxmode: %s\n",
-		tone, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode]);
-	ast_copy_string(p->curtone, tone, sizeof(p->curtone));
-	oseq = reqprep(&resp, p, "RQNT");
-	add_header(&resp, "X", p->rqnt_ident);
-	switch (p->hookstate) {
-	case MGCP_ONHOOK:
-		add_header(&resp, "R", "L/hd(N)");
-		break;
-	case MGCP_OFFHOOK:
-		add_header_offhook(sub, &resp, tone);
-		break;
-	}
-	if (!ast_strlen_zero(tone)) {
-		add_header(&resp, "S", tone);
-	}
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_RQNT;
-	resp.trid = oseq;
-	return send_request(p, NULL, &resp, oseq);
-}
-
-static int transmit_notify_request_with_callerid(struct mgcp_subchannel *sub, char *tone, char *callernum, char *callername)
-{
-	struct mgcp_request resp;
-	char tone2[256];
-	char *l, *n;
-	struct timeval t = ast_tvnow();
-	struct ast_tm tm;
-	struct mgcp_endpoint *p = sub->parent;
-	unsigned int oseq;
-
-	ast_localtime(&t, &tm, NULL);
-	n = callername;
-	l = callernum;
-	if (!n)
-		n = "";
-	if (!l)
-		l = "";
-
-	/* Keep track of last callerid for blacklist and callreturn */
-	ast_copy_string(p->lastcallerid, l, sizeof(p->lastcallerid));
-
-	snprintf(tone2, sizeof(tone2), "%s,L/ci(%02d/%02d/%02d/%02d,%s,%s)", tone,
-		tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, l, n);
-	ast_copy_string(p->curtone, tone, sizeof(p->curtone));
-	oseq = reqprep(&resp, p, "RQNT");
-	add_header(&resp, "X", p->rqnt_ident);
-	switch (p->hookstate) {
-	case MGCP_ONHOOK:
-		add_header(&resp, "R", "L/hd(N)");
-		break;
-	case MGCP_OFFHOOK:
-		add_header_offhook(sub, &resp, tone);
-		break;
-	}
-	if (!ast_strlen_zero(tone2)) {
-		add_header(&resp, "S", tone2);
-	}
-	ast_debug(3, "MGCP Asked to indicate tone: %s on  %s@%s-%d in cxmode: %s\n",
-		tone2, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode]);
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_RQNT;
-	resp.trid = oseq;
-	return send_request(p, NULL, &resp, oseq);
-}
-
-static int transmit_modify_request(struct mgcp_subchannel *sub)
-{
-	struct mgcp_request resp;
-	struct mgcp_endpoint *p = sub->parent;
-	int i;
-	int fc = 1;
-	char local[256];
-	char tmp[80];
-	unsigned int oseq;
-
-	if (ast_strlen_zero(sub->cxident)) {
-		/* We don't have a CXident yet, store the destination and
-		   wait a bit */
-		return 0;
-	}
-	ast_debug(3, "Modified %s@%s-%d with new mode: %s on callid: %s\n",
-		p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid);
-
-	ast_copy_string(local, "", sizeof(local));
-	for (i = 0; i < ast_format_cap_count(p->cap); i++) {
-		struct ast_format *format = ast_format_cap_get_format(p->cap, i);
-
-		if (p->ncs && !fc) {
-			ast_format_cap_remove_by_type(p->cap, AST_MEDIA_TYPE_UNKNOWN);
-			ast_format_cap_append(p->cap, format, 0); /* sb5120e bug */
-			ao2_ref(format, -1);
-			break;
-		} else {
-			fc = 0;
-			snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, format, 0, 0));
-		}
-		strncat(local, tmp, sizeof(local) - strlen(local) - 1);
-
-		ao2_ref(format, -1);
-	}
-
-	if (!sub->sdpsent) {
-		if (sub->gate) {
-			if (sub->gate->state == GATE_ALLOCATED || sub->gate->state == GATE_OPEN) {
-				snprintf(tmp, sizeof(tmp), ", dq-gi:%x", sub->gate->gateid);
-				strncat(local, tmp, sizeof(local) - strlen(local) - 1);
-			} else {
-					/* we still don't have gateid wait */
-				return 0;
-			}
-		}
-	}
-
-	oseq = reqprep(&resp, p, "MDCX");
-	add_header(&resp, "C", sub->callid);
-	if (!sub->sdpsent) {
-		add_header(&resp, "L", local);
-	}
-	add_header(&resp, "M", mgcp_cxmodes[sub->cxmode]);
-	/* X header should not be sent. kept for compatibility */
-	add_header(&resp, "X", sub->txident);
-	add_header(&resp, "I", sub->cxident);
-	switch (sub->parent->hookstate) {
-	case MGCP_ONHOOK:
-		add_header(&resp, "R", "L/hd(N)");
-		break;
-	case MGCP_OFFHOOK:
-		add_header_offhook(sub, &resp, "");
-		break;
-	}
-	if (!sub->sdpsent) {
-		add_sdp(&resp, sub, NULL);
-		sub->sdpsent = 1;
-	}
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_MDCX;
-	resp.trid = oseq;
-	return send_request(p, sub, &resp, oseq);
-}
-
-
-static void add_header_offhook(struct mgcp_subchannel *sub, struct mgcp_request *resp, char *tone)
-{
-	struct mgcp_endpoint *p = sub->parent;
-	char tone_indicate_end = 0;
-
-	/* We also should check the tone to indicate, because it have no sense
-	   to request notify D/[0-9#*] (dtmf keys) if we are sending congestion
-	   tone for example G/cg */
-	if (p && (!strcasecmp(tone, (p->ncs ? "L/ro" : "G/cg")))) {
-		tone_indicate_end = 1;
-	}
-
-	if (p && p->sub && p->sub->owner &&
-			ast_channel_state(p->sub->owner) >= AST_STATE_RINGING &&
-			(p->dtmfmode & (MGCP_DTMF_INBAND | MGCP_DTMF_HYBRID))) {
-	    add_header(resp, "R", "L/hu(N),L/hf(N)");
-
-	} else if (!tone_indicate_end){
-	    add_header(resp, "R", (p->ncs ? "L/hu(N),L/hf(N),L/[0-9#*](N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"));
-	} else {
-		ast_debug(1, "We don't want more digits if we will end the call\n");
-		add_header(resp, "R", "L/hu(N),L/hf(N)");
-	}
-}
-
-
-
-
-static int transmit_audit_endpoint(struct mgcp_endpoint *p)
-{
-	struct mgcp_request resp;
-	unsigned int oseq;
-	oseq = reqprep(&resp, p, "AUEP");
-	/* removed unknown param VS */
-	/*add_header(&resp, "F", "A,R,D,S,X,N,I,T,O,ES,E,MD,M");*/
-	add_header(&resp, "F", "A");
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_AUEP;
-	resp.trid = oseq;
-	return send_request(p, NULL, &resp, oseq);
-}
-
-static int transmit_connection_del(struct mgcp_subchannel *sub)
-{
-	struct mgcp_endpoint *p = sub->parent;
-	struct mgcp_request resp;
-	unsigned int oseq;
-
-	ast_debug(3, "Delete connection %s %s@%s-%d with new mode: %s on callid: %s\n",
-		sub->cxident, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid);
-	oseq = reqprep(&resp, p, "DLCX");
-	/* check if call id is avail */
-	if (sub->callid[0])
-		add_header(&resp, "C", sub->callid);
-	/* X header should not be sent. kept for compatibility */
-	add_header(&resp, "X", sub->txident);
-	/* check if cxident is avail */
-	if (sub->cxident[0])
-		add_header(&resp, "I", sub->cxident);
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_DLCX;
-	resp.trid = oseq;
-	return send_request(p, sub, &resp, oseq);
-}
-
-static int transmit_connection_del_w_params(struct mgcp_endpoint *p, char *callid, char *cxident)
-{
-	struct mgcp_request resp;
-	unsigned int oseq;
-
-	ast_debug(3, "Delete connection %s %s@%s on callid: %s\n",
-		cxident ? cxident : "", p->name, p->parent->name, callid ? callid : "");
-	oseq = reqprep(&resp, p, "DLCX");
-	/* check if call id is avail */
-	if (callid && *callid)
-		add_header(&resp, "C", callid);
-	/* check if cxident is avail */
-	if (cxident && *cxident)
-		add_header(&resp, "I", cxident);
-	/* fill in new fields */
-	resp.cmd = MGCP_CMD_DLCX;
-	resp.trid = oseq;
-	return send_request(p, p->sub, &resp, oseq);
-}
-
-/*! \brief  dump_cmd_queues: (SC:) cleanup pending commands */
-static void dump_cmd_queues(struct mgcp_endpoint *p, struct mgcp_subchannel *sub)
-{
-	struct mgcp_request *t, *q;
-
-	if (p) {
-		ast_mutex_lock(&p->rqnt_queue_lock);
-		for (q = p->rqnt_queue; q; t = q->next, ast_free(q), q=t);
-		p->rqnt_queue = NULL;
-		ast_mutex_unlock(&p->rqnt_queue_lock);
-
-		ast_mutex_lock(&p->cmd_queue_lock);
-		for (q = p->cmd_queue; q; t = q->next, ast_free(q), q=t);
-		p->cmd_queue = NULL;
-		ast_mutex_unlock(&p->cmd_queue_lock);
-
-		ast_mutex_lock(&p->sub->cx_queue_lock);
-		for (q = p->sub->cx_queue; q; t = q->next, ast_free(q), q=t);
-		p->sub->cx_queue = NULL;
-		ast_mutex_unlock(&p->sub->cx_queue_lock);
-
-		ast_mutex_lock(&p->sub->next->cx_queue_lock);
-		for (q = p->sub->next->cx_queue; q; t = q->next, ast_free(q), q=t);
-		p->sub->next->cx_queue = NULL;
-		ast_mutex_unlock(&p->sub->next->cx_queue_lock);
-	} else if (sub) {
-		ast_mutex_lock(&sub->cx_queue_lock);
-		for (q = sub->cx_queue; q; t = q->next, ast_free(q), q=t);
-		sub->cx_queue = NULL;
-		ast_mutex_unlock(&sub->cx_queue_lock);
-	}
-}
-
-
-/*! \brief  find_command: (SC:) remove command transaction from queue */
-static struct mgcp_request *find_command(struct mgcp_endpoint *p, struct mgcp_subchannel *sub,
-		struct mgcp_request **queue, ast_mutex_t *l, int ident)
-{
-	struct mgcp_request *prev, *req;
-
-	ast_mutex_lock(l);
-	for (prev = NULL, req = *queue; req; prev = req, req = req->next) {
-		if (req->trid == ident) {
-			/* remove from queue */
-			if (!prev)
-				*queue = req->next;
-			else
-				prev->next = req->next;
-
-			/* send next pending command */
-			if (*queue) {
-				ast_debug(1, "Posting Queued Request:\n%s to %s:%d\n", (*queue)->data,
-					ast_inet_ntoa(p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port));
-
-				mgcp_postrequest(p, sub, (*queue)->data, (*queue)->len, (*queue)->trid);
-			}
-			break;
-		}
-	}
-	ast_mutex_unlock(l);
-	return req;
-}
-
-/* modified for new transport mechanism */
-static void handle_response(struct mgcp_endpoint *p, struct mgcp_subchannel *sub,
-		int result, unsigned int ident, struct mgcp_request *resp)
-{
-	char *c;
-	struct mgcp_request *req;
-	struct mgcp_gateway *gw = p->parent;
-
-	if (result < 200) {
-		/* provisional response */
-		return;
-	}
-
-	if (p->slowsequence)
-		req = find_command(p, sub, &p->cmd_queue, &p->cmd_queue_lock, ident);
-	else if (sub)
-		req = find_command(p, sub, &sub->cx_queue, &sub->cx_queue_lock, ident);
-	else if (!(req = find_command(p, sub, &p->rqnt_queue, &p->rqnt_queue_lock, ident)))
-		req = find_command(p, sub, &p->cmd_queue, &p->cmd_queue_lock, ident);
-
-	if (!req) {
-		ast_verb(3, "No command found on [%s] for transaction %u. Ignoring...\n",
-				gw->name, ident);
-		return;
-	}
-
-	if (p && (result >= 400) && (result <= 599)) {
-		switch (result) {
-		case 401:
-			p->hookstate = MGCP_OFFHOOK;
-			break;
-		case 402:
-			p->hookstate = MGCP_ONHOOK;
-			break;
-		case 406:
-			ast_log(LOG_NOTICE, "Transaction %u timed out\n", ident);
-			break;
-		case 407:
-			ast_log(LOG_NOTICE, "Transaction %u aborted\n", ident);
-			break;
-		}
-		if (sub) {
-			if (!sub->cxident[0] && (req->cmd == MGCP_CMD_CRCX)) {
-			    ast_log(LOG_NOTICE, "DLCX for all connections on %s due to error %d\n", gw->name, result);
-			    transmit_connection_del(sub);
-			}
-			if (sub->owner) {
-				ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n",
-					result, p->name, p->parent->name, sub ? sub->id:-1);
-				mgcp_queue_hangup(sub);
-			}
-		} else {
-			if (p->sub->next->owner) {
-				ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n",
-					result, p->name, p->parent->name, sub ? sub->id:-1);
-				mgcp_queue_hangup(p->sub);
-			}
-
-			if (p->sub->owner) {
-				ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n",
-					result, p->name, p->parent->name, sub ? sub->id:-1);
-				mgcp_queue_hangup(p->sub);
-			}
-
-			dump_cmd_queues(p, NULL);
-		}
-	}
-
-	if (resp) {
-		/* responseAck: */
-		if (result == 200 && (req->cmd == MGCP_CMD_CRCX || req->cmd == MGCP_CMD_MDCX)) {
-				if (sub) {
-					transmit_response(sub, "000", resp, "OK");
-					if (sub->owner && ast_channel_state(sub->owner) == AST_STATE_RINGING) {
-						ast_queue_control(sub->owner, AST_CONTROL_RINGING);
-					}
-				}
-		}
-		if (req->cmd == MGCP_CMD_CRCX) {
-			if ((c = get_header(resp, "I"))) {
-				if (!ast_strlen_zero(c) && sub) {
-					/* if we are hanging up do not process this conn. */
-					if (sub->owner) {
-						if (!ast_strlen_zero(sub->cxident)) {
-							if (strcasecmp(c, sub->cxident)) {
-								ast_log(LOG_WARNING, "Subchannel already has a cxident. sub->cxident: %s requested %s\n", sub->cxident, c);
-							}
-						}
-						ast_copy_string(sub->cxident, c, sizeof(sub->cxident));
-						if (sub->tmpdest.sin_addr.s_addr) {
-							transmit_modify_with_sdp(sub, NULL, 0);
-						}
-					} else {
-						/* XXX delete this one
-						   callid and conn id may already be lost.
-						   so the following del conn may have a side effect of
-						   cleaning up the next subchannel */
-						transmit_connection_del(sub);
-					}
-				}
-			}
-		}
-
-		if (req->cmd == MGCP_CMD_AUEP) {
-			/* check stale connection ids */
-			if ((c = get_header(resp, "I"))) {
-				char *v, *n;
-				int len;
-				while ((v = get_csv(c, &len, &n))) {
-					if (len) {
-						if (strncasecmp(v, p->sub->cxident, len) &&
-						    strncasecmp(v, p->sub->next->cxident, len)) {
-							/* connection id not found. delete it */
-							char cxident[80] = "";
-
-							if (len > (sizeof(cxident) - 1))
-								len = sizeof(cxident) - 1;
-							ast_copy_string(cxident, v, len);
-							ast_verb(3, "Non existing connection id %s on %s@%s \n",
-									    cxident, p->name, gw->name);
-							transmit_connection_del_w_params(p, NULL, cxident);
-						}
-					}
-					c = n;
-				}
-			}
-
-			/* Try to determine the hookstate returned from an audit endpoint command */
-			if ((c = get_header(resp, "ES"))) {
-				if (!ast_strlen_zero(c)) {
-					if (strstr(c, "hu")) {
-						if (p->hookstate != MGCP_ONHOOK) {
-							/* XXX cleanup if we think we are offhook XXX */
-							if ((p->sub->owner || p->sub->next->owner ) &&
-							    p->hookstate == MGCP_OFFHOOK)
-								mgcp_queue_hangup(sub);
-							p->hookstate = MGCP_ONHOOK;
-
-							/* update the requested events according to the new hookstate */
-							transmit_notify_request(p->sub, "");
-
-							ast_verb(3, "Setting hookstate of %s@%s to ONHOOK\n", p->name, gw->name);
-							}
-					} else if (strstr(c, "hd")) {
-						if (p->hookstate != MGCP_OFFHOOK) {
-							p->hookstate = MGCP_OFFHOOK;
-
-							/* update the requested events according to the new hookstate */
-							transmit_notify_request(p->sub, "");
-
-							ast_verb(3, "Setting hookstate of %s@%s to OFFHOOK\n", p->name, gw->name);
-							}
-						}
-					}
-				}
-			}
-
-		if (resp && resp->lines) {
-			/* do not process sdp if we are hanging up. this may be a late response */
-			if (sub && sub->owner) {
-				if (!sub->rtp)
-					start_rtp(sub);
-				if (sub->rtp)
-					process_sdp(sub, resp);
-			}
-		}
-	}
-
-	ast_free(req);
-}
-
-static void start_rtp(struct mgcp_subchannel *sub)
-{
-	struct ast_sockaddr bindaddr_tmp;
-
-	ast_mutex_lock(&sub->lock);
-	/* check again to be on the safe side */
-	if (sub->rtp) {
-		ast_rtp_instance_destroy(sub->rtp);
-		sub->rtp = NULL;
-	}
-	/* Allocate the RTP now */
-	ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr);
-	sub->rtp = ast_rtp_instance_new("asterisk", sched, &bindaddr_tmp, NULL);
-	if (sub->rtp && sub->owner)
-		ast_channel_set_fd(sub->owner, 0, ast_rtp_instance_fd(sub->rtp, 0));
-	if (sub->rtp) {
-		ast_rtp_instance_set_qos(sub->rtp, qos.tos_audio, qos.cos_audio, "MGCP RTP");
-		ast_rtp_instance_set_prop(sub->rtp, AST_RTP_PROPERTY_NAT, sub->nat);
-	}
-	/* Make a call*ID */
-	snprintf(sub->callid, sizeof(sub->callid), "%08lx%s", (unsigned long)ast_random(), sub->txident);
-	/* Transmit the connection create */
-	if(!sub->parent->pktcgatealloc) {
-		transmit_connect_with_sdp(sub, NULL);
-	} else {
-		transmit_connect(sub);
-		sub->gate = NULL;
-		if(!mgcp_alloc_pktcgate(sub))
-			mgcp_queue_hangup(sub);
-	}
-	ast_mutex_unlock(&sub->lock);
-}
-
-static void *mgcp_ss(void *data)
-{
-	struct ast_channel *chan = data;
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(chan);
-	struct mgcp_endpoint *p = sub->parent;
-	/* char exten[AST_MAX_EXTENSION] = ""; */
-	int len = 0;
-	int timeout = firstdigittimeout;
-	int res= 0;
-	int getforward = 0;
-	int loop_pause = 100;
-	RAII_VAR(struct ast_features_pickup_config *, pickup_cfg, NULL, ao2_cleanup);
-	const char *pickupexten;
-
-	len = strlen(p->dtmf_buf);
-
-	ast_channel_lock(chan);
-	pickup_cfg = ast_get_chan_features_pickup_config(chan);
-	if (!pickup_cfg) {
-		ast_log(LOG_ERROR, "Unable to retrieve pickup configuration options. Unable to detect call pickup extension\n");
-		pickupexten = "";
-	} else {
-		pickupexten = ast_strdupa(pickup_cfg->pickupexten);
-	}
-	ast_channel_unlock(chan);
-
-	while (len < AST_MAX_EXTENSION - 1) {
-		ast_debug(1, "Dtmf buffer '%s' for '%s@%s'\n", p->dtmf_buf, p->name, p->parent->name);
-		res = 1;  /* Assume that we will get a digit */
-		while (strlen(p->dtmf_buf) == len) {
-			ast_safe_sleep(chan, loop_pause);
-			timeout -= loop_pause;
-			if (timeout <= 0){
-				res = 0;
-				break;
-			}
-			res = 1;
-		}
-
-		timeout = 0;
-		len = strlen(p->dtmf_buf);
-
-		if (!ast_ignore_pattern(ast_channel_context(chan), p->dtmf_buf)) {
-			/*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/
-			ast_indicate(chan, -1);
-		} else {
-			/* XXX Redundant?  We should already be playing dialtone */
-			/*tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALTONE);*/
-			transmit_notify_request(sub, "L/dl");
-		}
-		if (ast_exists_extension(chan, ast_channel_context(chan), p->dtmf_buf, 1, p->cid_num)) {
-			if (!res || !ast_matchmore_extension(chan, ast_channel_context(chan), p->dtmf_buf, 1, p->cid_num)) {
-				if (getforward) {
-					/* Record this as the forwarding extension */
-					ast_copy_string(p->call_forward, p->dtmf_buf, sizeof(p->call_forward));
-					ast_verb(3, "Setting call forward to '%s' on channel %s\n",
-							p->call_forward, ast_channel_name(chan));
-					/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-					transmit_notify_request(sub, "L/sl");
-					if (res)
-						break;
-					usleep(500000);
-					/*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/
-					ast_indicate(chan, -1);
-					sleep(1);
-					memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-					/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALTONE);*/
-					transmit_notify_request(sub, "L/dl");
-					len = 0;
-					getforward = 0;
-				} else {
-					/*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/
-					ast_indicate(chan, -1);
-					ast_channel_lock(chan);
-					ast_channel_exten_set(chan, p->dtmf_buf);
-					ast_channel_dialed(chan)->number.str = ast_strdup(p->dtmf_buf);
-					memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-					ast_set_callerid(chan,
-						p->hidecallerid ? "" : p->cid_num,
-						p->hidecallerid ? "" : p->cid_name,
-						ast_channel_caller(chan)->ani.number.valid ? NULL : p->cid_num);
-					ast_setstate(chan, AST_STATE_RING);
-					ast_channel_unlock(chan);
-					if (p->dtmfmode & MGCP_DTMF_HYBRID) {
-						p->dtmfmode |= MGCP_DTMF_INBAND;
-						ast_indicate(chan, -1);
-					}
-					res = ast_pbx_run(chan);
-					if (res) {
-						ast_log(LOG_WARNING, "PBX exited non-zero\n");
-						/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_CONGESTION);*/
-						/*transmit_notify_request(p, "nbz", 1);*/
-						transmit_notify_request(sub, p->ncs ? "L/cg" : "G/cg");
-					}
-					return NULL;
-				}
-			} else {
-				/* It's a match, but they just typed a digit, and there is an ambiguous match,
-				   so just set the timeout to matchdigittimeout and wait some more */
-				timeout = matchdigittimeout;
-			}
-		} else if (res == 0) {
-			ast_debug(1, "not enough digits (and no ambiguous match)...\n");
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_CONGESTION);*/
-			transmit_notify_request(sub, p->ncs ? "L/cg" : "G/cg");
-			/*dahdi_wait_event(p->subs[index].zfd);*/
-			ast_hangup(chan);
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			return NULL;
-		} else if (p->hascallwaiting && p->callwaiting && !strcmp(p->dtmf_buf, "*70")) {
-			ast_verb(3, "Disabling call waiting on %s\n", ast_channel_name(chan));
-			/* Disable call waiting if enabled */
-			p->callwaiting = 0;
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-			transmit_notify_request(sub, "L/sl");
-			len = 0;
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			timeout = firstdigittimeout;
-		} else if (!strcmp(p->dtmf_buf, pickupexten)) {
-			/* Scan all channels and see if any there
-			 * ringing channels with that have call groups
-			 * that equal this channels pickup group
-			 */
-			if (ast_pickup_call(chan)) {
-				ast_log(LOG_WARNING, "No call pickup possible...\n");
-				/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_CONGESTION);*/
-				transmit_notify_request(sub, p->ncs ? "L/cg" : "G/cg");
-			}
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			ast_hangup(chan);
-			return NULL;
-		} else if (!p->hidecallerid && !strcmp(p->dtmf_buf, "*67")) {
-			ast_verb(3, "Disabling Caller*ID on %s\n", ast_channel_name(chan));
-			/* Disable Caller*ID if enabled */
-			p->hidecallerid = 1;
-			ast_set_callerid(chan, "", "", NULL);
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-			transmit_notify_request(sub, "L/sl");
-			len = 0;
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			timeout = firstdigittimeout;
-		} else if (p->callreturn && !strcmp(p->dtmf_buf, "*69")) {
-			res = 0;
-			if (!ast_strlen_zero(p->lastcallerid)) {
-				res = ast_say_digit_str(chan, p->lastcallerid, "", ast_channel_language(chan));
-			}
-			if (!res)
-				/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-				transmit_notify_request(sub, "L/sl");
-			break;
-		} else if (!strcmp(p->dtmf_buf, "*78")) {
-			/* Do not disturb */
-			ast_verb(3, "Enabled DND on channel %s\n", ast_channel_name(chan));
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-			transmit_notify_request(sub, "L/sl");
-			p->dnd = 1;
-			getforward = 0;
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			len = 0;
-		} else if (!strcmp(p->dtmf_buf, "*79")) {
-			/* Do not disturb */
-			ast_verb(3, "Disabled DND on channel %s\n", ast_channel_name(chan));
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-			transmit_notify_request(sub, "L/sl");
-			p->dnd = 0;
-			getforward = 0;
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			len = 0;
-		} else if (p->cancallforward && !strcmp(p->dtmf_buf, "*72")) {
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-			transmit_notify_request(sub, "L/sl");
-			getforward = 1;
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			len = 0;
-		} else if (p->cancallforward && !strcmp(p->dtmf_buf, "*73")) {
-			ast_verb(3, "Cancelling call forwarding on channel %s\n", ast_channel_name(chan));
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-			transmit_notify_request(sub, "L/sl");
-			memset(p->call_forward, 0, sizeof(p->call_forward));
-			getforward = 0;
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			len = 0;
-		} else if (ast_parking_provider_registered() && ast_parking_is_exten_park(ast_channel_context(chan), p->dtmf_buf) &&
-			sub->next->owner) {
-			RAII_VAR(struct ast_bridge_channel *, bridge_channel, NULL, ao2_cleanup);
-			/* This is a three way call, the main call being a real channel,
-				and we're parking the first call. */
-			ast_channel_lock(chan);
-			bridge_channel = ast_channel_get_bridge_channel(chan);
-			ast_channel_unlock(chan);
-			if (bridge_channel && !ast_parking_blind_transfer_park(bridge_channel, ast_channel_context(chan), p->dtmf_buf, NULL, NULL)) {
-				ast_verb(3, "Parking call to '%s'\n", ast_channel_name(chan));
-			}
-			break;
-		} else if (!ast_strlen_zero(p->lastcallerid) && !strcmp(p->dtmf_buf, "*60")) {
-			ast_verb(3, "Blacklisting number %s\n", p->lastcallerid);
-			res = ast_db_put("blacklist", p->lastcallerid, "1");
-			if (!res) {
-				/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-				transmit_notify_request(sub, "L/sl");
-				memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-				len = 0;
-			}
-		} else if (p->hidecallerid && !strcmp(p->dtmf_buf, "*82")) {
-			ast_verb(3, "Enabling Caller*ID on %s\n", ast_channel_name(chan));
-			/* Enable Caller*ID if enabled */
-			p->hidecallerid = 0;
-			ast_set_callerid(chan, p->cid_num, p->cid_name, NULL);
-			/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
-			transmit_notify_request(sub, "L/sl");
-			len = 0;
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			timeout = firstdigittimeout;
-		} else if (!ast_canmatch_extension(chan, ast_channel_context(chan), p->dtmf_buf, 1,
-			S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))
-			&& ((p->dtmf_buf[0] != '*') || (strlen(p->dtmf_buf) > 2))) {
-			ast_debug(1, "Can't match %s from '%s' in context %s\n", p->dtmf_buf,
-				S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, "<Unknown Caller>"),
-				ast_channel_context(chan));
-			break;
-		}
-		if (!timeout)
-			timeout = gendigittimeout;
-		if (len && !ast_ignore_pattern(ast_channel_context(chan), p->dtmf_buf))
-			/*tone_zone_play_tone(p->subs[index].zfd, -1);*/
-			ast_indicate(chan, -1);
-	}
-#if 0
-	for (;;) {
-		res = ast_waitfordigit(chan, to);
-		if (!res) {
-			ast_debug(1, "Timeout...\n");
-			break;
-		}
-		if (res < 0) {
-			ast_debug(1, "Got hangup...\n");
-			ast_hangup(chan);
-			break;
-		}
-		exten[pos++] = res;
-		if (!ast_ignore_pattern(chan->context, exten))
-			ast_indicate(chan, -1);
-		if (ast_matchmore_extension(chan, chan->context, exten, 1, chan->callerid)) {
-			if (ast_exists_extension(chan, chan->context, exten, 1, chan->callerid))
-				to = 3000;
-			else
-				to = 8000;
-		} else
-			break;
-	}
-	if (ast_exists_extension(chan, chan->context, exten, 1, chan->callerid)) {
-		ast_copy_string(chan->exten, exten, sizeof(chan->exten)1);
-		if (!p->rtp) {
-			start_rtp(p);
-		}
-		ast_setstate(chan, AST_STATE_RING);
-		chan->rings = 1;
-		if (ast_pbx_run(chan)) {
-			ast_log(LOG_WARNING, "Unable to launch PBX on %s\n", chan->name);
-		} else {
-			memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			return NULL;
-		}
-	}
-#endif
-	ast_hangup(chan);
-	memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-	return NULL;
-}
-
-/*! \brief Complete an attended transfer
- *
- * \param p The endpoint performing the attended transfer
- * \param sub The sub-channel completing the attended transfer
- *
- * \note p->sub is the currently active sub-channel (the channel the phone is using)
- * \note p->sub->next is the sub-channel not in use, potentially on hold
- *
- * \retval 0 when channel should be hung up
- * \retval 1 when channel should not be hung up
- */
-static int attempt_transfer(struct mgcp_endpoint *p, struct mgcp_subchannel *sub)
-{
-	enum ast_transfer_result res;
-
-	/* Ensure that the other channel goes off hold and that it is indicating properly */
-	ast_queue_unhold(sub->next->owner);
-	if (ast_channel_state(sub->owner) == AST_STATE_RINGING) {
-		ast_queue_control(sub->next->owner, AST_CONTROL_RINGING);
-	}
-
-	ast_mutex_unlock(&p->sub->next->lock);
-	ast_mutex_unlock(&p->sub->lock);
-	res = ast_bridge_transfer_attended(sub->owner, sub->next->owner);
-
-	/* Subs are only freed when the endpoint itself is destroyed, so they will continue to exist
-	 * after ast_bridge_transfer_attended returns making this safe without reference counting
-	 */
-	ast_mutex_lock(&p->sub->lock);
-	ast_mutex_lock(&p->sub->next->lock);
-
-	if (res != AST_BRIDGE_TRANSFER_SUCCESS) {
-		/* If transferring fails hang up the other channel if present and us */
-		if (sub->next->owner) {
-			ast_channel_softhangup_internal_flag_add(sub->next->owner, AST_SOFTHANGUP_DEV);
-			mgcp_queue_hangup(sub->next);
-		}
-		sub->next->alreadygone = 1;
-		return 0;
-	}
-
-	unalloc_sub(sub->next);
-
-	/* If the active sub is NOT the one completing the transfer change it to be, and hang up the other sub */
-	if (p->sub != sub) {
-		p->sub = sub;
-		return 1;
-	}
-
-	return 0;
-}
-
-static void handle_hd_hf(struct mgcp_subchannel *sub, char *ev)
-{
-	struct mgcp_endpoint *p = sub->parent;
-	struct ast_channel *c;
-	pthread_t t;
-
-	/* Off hook / answer */
-	if (sub->outgoing) {
-		/* Answered */
-		if (sub->owner) {
-			ast_queue_unhold(sub->owner);
-			sub->cxmode = MGCP_CX_SENDRECV;
-			if (!sub->rtp) {
-				start_rtp(sub);
-			} else {
-				transmit_modify_request(sub);
-			}
-			/*transmit_notify_request(sub, "aw");*/
-			transmit_notify_request(sub, "");
-			mgcp_queue_control(sub, AST_CONTROL_ANSWER);
-		}
-	} else {
-		/* Start switch */
-		/*sub->cxmode = MGCP_CX_SENDRECV;*/
-		if (!sub->owner) {
-			if (!sub->rtp) {
-				start_rtp(sub);
-			} else {
-				transmit_modify_request(sub);
-			}
-			if (p->immediate) {
-				/* The channel is immediately up. Start right away */
-#ifdef DLINK_BUGGY_FIRMWARE
-				transmit_notify_request(sub, "rt");
-#else
-				transmit_notify_request(sub, p->ncs ? "L/rt" : "G/rt");
-#endif
-				c = mgcp_new(sub, AST_STATE_RING, NULL, NULL);
-				if (!c) {
-					ast_log(LOG_WARNING, "Unable to start PBX on channel %s@%s\n", p->name, p->parent->name);
-					transmit_notify_request(sub, p->ncs ? "L/cg" : "G/cg");
-					ast_hangup(c);
-				}
-			} else {
-				if (has_voicemail(p)) {
-					transmit_notify_request(sub, "L/sl");
-				} else {
-					transmit_notify_request(sub, "L/dl");
-				}
-				c = mgcp_new(sub, AST_STATE_DOWN, NULL, NULL);
-				if (c) {
-					if (ast_pthread_create_detached(&t, NULL, mgcp_ss, c)) {
-						ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno));
-						ast_hangup(c);
-					}
-				} else {
-					ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", p->name, p->parent->name);
-				}
-			}
-		} else {
-			if (p->hookstate == MGCP_OFFHOOK) {
-				ast_log(LOG_WARNING, "Off hook, but already have owner on %s@%s\n", p->name, p->parent->name);
-			} else {
-				ast_log(LOG_WARNING, "On hook, but already have owner on %s@%s\n", p->name, p->parent->name);
-				ast_log(LOG_WARNING, "If we're onhook why are we here trying to handle a hd or hf?\n");
-			}
-			ast_queue_unhold(sub->owner);
-			sub->cxmode = MGCP_CX_SENDRECV;
-			if (!sub->rtp) {
-				start_rtp(sub);
-			} else {
-				transmit_modify_request(sub);
-			}
-			/*transmit_notify_request(sub, "aw");*/
-			transmit_notify_request(sub, "");
-			/*ast_queue_control(sub->owner, AST_CONTROL_ANSWER);*/
-		}
-	}
-}
-
-static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, struct sockaddr_in *sin)
-{
-	char *ev, *s;
-	struct ast_frame f = { 0, };
-	struct mgcp_endpoint *p = sub->parent;
-	struct mgcp_gateway *g = NULL;
-	int res;
-
-	ast_debug(1, "Handling request '%s' on %s@%s\n", req->verb, p->name, p->parent->name);
-	/* Clear out potential response */
-	if (!strcasecmp(req->verb, "RSIP")) {
-		/* Test if this RSIP request is just a keepalive */
-		if (!strcasecmp( get_header(req, "RM"), "X-keepalive")) {
-			ast_verb(3, "Received keepalive request from %s@%s\n", p->name, p->parent->name);
-			transmit_response(sub, "200", req, "OK");
-		} else {
-			dump_queue(p->parent, p);
-			dump_cmd_queues(p, NULL);
-
-			if ((strcmp(p->name, p->parent->wcardep) != 0)) {
-				ast_verb(3, "Resetting interface %s@%s\n", p->name, p->parent->name);
-			}
-			/* For RSIP on wildcard we reset all endpoints */
-			if (!strcmp(p->name, p->parent->wcardep)) {
-				/* Reset all endpoints */
-				struct mgcp_endpoint *tmp_ep;
-
-				g = p->parent;
-				for (tmp_ep = g->endpoints; tmp_ep; tmp_ep = tmp_ep->next) {
-					/*if ((strcmp(tmp_ep->name, "*") != 0) && (strcmp(tmp_ep->name, "aaln/" "*") != 0)) {*/
-					if (strcmp(tmp_ep->name, g->wcardep) != 0) {
-						struct mgcp_subchannel *tmp_sub, *first_sub;
-						ast_verb(3, "Resetting interface %s@%s\n", tmp_ep->name, p->parent->name);
-
-						first_sub = tmp_ep->sub;
-						tmp_sub = tmp_ep->sub;
-						while (tmp_sub) {
-							mgcp_queue_hangup(tmp_sub);
-							tmp_sub = tmp_sub->next;
-							if (tmp_sub == first_sub)
-								break;
-						}
-					}
-				}
-			} else if (sub->owner) {
-				mgcp_queue_hangup(sub);
-			}
-			transmit_response(sub, "200", req, "OK");
-			/* We don't send NTFY or AUEP to wildcard ep */
-			if (strcmp(p->name, p->parent->wcardep) != 0) {
-				transmit_notify_request(sub, "");
-				/* Audit endpoint.
-				 Idea is to prevent lost lines due to race conditions
-				*/
-				transmit_audit_endpoint(p);
-			}
-		}
-	} else if (!strcasecmp(req->verb, "NTFY")) {
-		/* Acknowledge and be sure we keep looking for the same things */
-		transmit_response(sub, "200", req, "OK");
-		/* Notified of an event */
-		ev = get_header(req, "O");
-		s = strchr(ev, '/');
-		if (s) ev = s + 1;
-		ast_debug(1, "Endpoint '%s@%s-%d' observed '%s'\n", p->name, p->parent->name, sub->id, ev);
-		/* Keep looking for events unless this was a hangup */
-		if (strcasecmp(ev, "hu") && strcasecmp(ev, "hd") && strcasecmp(ev, "ping")) {
-			transmit_notify_request(sub, p->curtone);
-		}
-		if (!strcasecmp(ev, "hd")) {
-			p->hookstate = MGCP_OFFHOOK;
-			sub->cxmode = MGCP_CX_SENDRECV;
-
-			if (p) {
-			  /* When the endpoint have a Off hook transition we always
-			     starts without any previous dtmfs */
-			  memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf));
-			}
-
-			handle_hd_hf(sub, ev);
-		} else if (!strcasecmp(ev, "hf")) {
-			/* We can assume we are offhook if we received a hookflash */
-			/* First let's just do call wait and ignore threeway */
-			/* We're currently in charge */
-			if (p->hookstate != MGCP_OFFHOOK) {
-				/* Cisco c7940 sends hf even if the phone is onhook */
-				/* Thanks to point on IRC for pointing this out */
-				return -1;
-			}
-			/* do not let * conference two down channels */
-			if (sub->owner && ast_channel_state(sub->owner) == AST_STATE_DOWN && !sub->next->owner)
-				return -1;
-
-			if (p->callwaiting || p->transfer || p->threewaycalling) {
-				ast_verb(3, "Swapping %d for %d on %s@%s\n", p->sub->id, p->sub->next->id, p->name, p->parent->name);
-				p->sub = p->sub->next;
-
-				/* transfer control to our next subchannel */
-				if (!sub->next->owner) {
-					/* plave the first call on hold and start up a new call */
-					sub->cxmode = MGCP_CX_MUTE;
-					ast_verb(3, "MGCP Muting %d on %s@%s\n", sub->id, p->name, p->parent->name);
-					transmit_modify_request(sub);
-					if (sub->owner) {
-						ast_queue_hold(sub->owner, NULL);
-					}
-					sub->next->cxmode = MGCP_CX_RECVONLY;
-					handle_hd_hf(sub->next, ev);
-				} else if (sub->owner && sub->next->owner) {
-					/* We've got two active calls lets decide whether or not to conference or just flip flop */
-					if ((!sub->outgoing) && (!sub->next->outgoing)) {
-						/* We made both calls lets conference */
-						ast_verb(3, "MGCP Conferencing %d and %d on %s@%s\n",
-								sub->id, sub->next->id, p->name, p->parent->name);
-						sub->cxmode = MGCP_CX_CONF;
-						sub->next->cxmode = MGCP_CX_CONF;
-						ast_queue_unhold(sub->next->owner);
-						transmit_modify_request(sub);
-						transmit_modify_request(sub->next);
-					} else {
-						/* Let's flipflop between calls */
-						/* XXX Need to check for state up ??? */
-						/* XXX Need a way to indicate the current call, or maybe the call that's waiting */
-						ast_verb(3, "We didn't make one of the calls FLIPFLOP %d and %d on %s@%s\n",
-								sub->id, sub->next->id, p->name, p->parent->name);
-						sub->cxmode = MGCP_CX_MUTE;
-						ast_verb(3, "MGCP Muting %d on %s@%s\n", sub->id, p->name, p->parent->name);
-						transmit_modify_request(sub);
-
-						ast_queue_hold(sub->owner, NULL);
-						ast_queue_hold(sub->next->owner, NULL);
-
-						handle_hd_hf(sub->next, ev);
-					}
-				} else {
-					/* We've most likely lost one of our calls find an active call and bring it up */
-					if (sub->owner) {
-						p->sub = sub;
-					} else if (sub->next->owner) {
-						p->sub = sub->next;
-					} else {
-						/* We seem to have lost both our calls */
-						/* XXX - What do we do now? */
-						return -1;
-					}
-					ast_queue_unhold(p->sub->owner);
-					p->sub->cxmode = MGCP_CX_SENDRECV;
-					transmit_modify_request(p->sub);
-				}
-			} else {
-				ast_log(LOG_WARNING, "Callwaiting, call transfer or threeway calling not enabled on endpoint %s@%s\n",
-					p->name, p->parent->name);
-			}
-		} else if (!strcasecmp(ev, "hu")) {
-			p->hookstate = MGCP_ONHOOK;
-			sub->cxmode = MGCP_CX_RECVONLY;
-			ast_debug(1, "MGCP %s@%s Went on hook\n", p->name, p->parent->name);
-			/* Do we need to send MDCX before a DLCX ?
-			if (sub->rtp) {
-				transmit_modify_request(sub);
-			}
-			*/
-			if (p->transfer && (sub->owner && sub->next->owner) && ((!sub->outgoing) || (!sub->next->outgoing))) {
-				/* We're allowed to transfer, we have two active calls and */
-				/* we made at least one of the calls.  Let's try and transfer */
-				ast_mutex_lock(&p->sub->next->lock);
-				res = attempt_transfer(p, sub);
-				if (res) {
-					ast_log(LOG_WARNING, "Transfer attempt failed\n");
-					ast_mutex_unlock(&p->sub->next->lock);
-					return -1;
-				}
-				ast_mutex_unlock(&p->sub->next->lock);
-			} else {
-				/* Hangup the current call */
-				/* If there is another active call, mgcp_hangup will ring the phone with the other call */
-				if (sub->owner) {
-					sub->alreadygone = 1;
-					mgcp_queue_hangup(sub);
-				} else {
-					ast_verb(3, "MGCP handle_request(%s@%s-%d) ast_channel already destroyed, resending DLCX.\n",
-							p->name, p->parent->name, sub->id);
-					/* Instruct the other side to remove the connection since it apparently *
-					 * still thinks the channel is active. *
-					 * For Cisco IAD2421 /BAK/ */
-					transmit_connection_del(sub);
-				}
-			}
-			if ((p->hookstate == MGCP_ONHOOK) && (!sub->rtp) && (!sub->next->rtp)) {
-				p->hidecallerid = 0;
-				if (p->hascallwaiting && !p->callwaiting) {
-					ast_verb(3, "Enabling call waiting on MGCP/%s@%s-%d\n", p->name, p->parent->name, sub->id);
-					p->callwaiting = -1;
-				}
-				if (has_voicemail(p)) {
-					ast_verb(3, "MGCP handle_request(%s@%s) set vmwi(+)\n", p->name, p->parent->name);
-					transmit_notify_request(sub, "L/vmwi(+)");
-				} else {
-					ast_verb(3, "MGCP handle_request(%s@%s) set vmwi(-)\n", p->name, p->parent->name);
-					transmit_notify_request(sub, "L/vmwi(-)");
-				}
-			}
-		} else if ((strlen(ev) == 1) &&
-				(((ev[0] >= '0') && (ev[0] <= '9')) ||
-				 ((ev[0] >= 'A') && (ev[0] <= 'D')) ||
-				  (ev[0] == '*') || (ev[0] == '#'))) {
-			if (sub && sub->owner && (ast_channel_state(sub->owner) >=  AST_STATE_UP)) {
-				f.frametype = AST_FRAME_DTMF;
-				f.subclass.integer = ev[0];
-				f.src = "mgcp";
-				/* XXX MUST queue this frame to all subs in threeway call if threeway call is active */
-				mgcp_queue_frame(sub, &f);
-				ast_mutex_lock(&sub->next->lock);
-				if (sub->next->owner)
-					mgcp_queue_frame(sub->next, &f);
-				ast_mutex_unlock(&sub->next->lock);
-				if (strstr(p->curtone, (p->ncs ? "wt1" : "wt")) && (ev[0] == 'A')) {
-					memset(p->curtone, 0, sizeof(p->curtone));
-				}
-			} else {
-				p->dtmf_buf[strlen(p->dtmf_buf)] = ev[0];
-				p->dtmf_buf[strlen(p->dtmf_buf)] = '\0';
-			}
-		} else if (!strcasecmp(ev, "T")) {
-			/* Digit timeout -- unimportant */
-		} else if (!strcasecmp(ev, "ping")) {
-			/* ping -- unimportant */
-		} else {
-			ast_log(LOG_NOTICE, "Received unknown event '%s' from %s@%s\n", ev, p->name, p->parent->name);
-		}
-	} else {
-		ast_log(LOG_WARNING, "Unknown verb '%s' received from %s\n", req->verb, ast_inet_ntoa(sin->sin_addr));
-		transmit_response(sub, "510", req, "Unknown verb");
-	}
-	return 0;
-}
-
-static int find_and_retrans(struct mgcp_subchannel *sub, struct mgcp_request *req)
-{
-	int seqno=0;
-	time_t now;
-	struct mgcp_response *prev = NULL, *cur, *next, *answer = NULL;
-	time(&now);
-	if (sscanf(req->identifier, "%30d", &seqno) != 1) {
-		seqno = 0;
-	}
-	for (cur = sub->parent->parent->responses, next = cur ? cur->next : NULL; cur; cur = next, next = cur ? cur->next : NULL) {
-		if (now - cur->whensent > RESPONSE_TIMEOUT) {
-			/* Delete this entry */
-			if (prev)
-				prev->next = next;
-			else
-				sub->parent->parent->responses = next;
-			ast_free(cur);
-		} else {
-			if (seqno == cur->seqno)
-				answer = cur;
-			prev = cur;
-		}
-	}
-	if (answer) {
-		resend_response(sub, answer);
-		return 1;
-	}
-	return 0;
-}
-
-static int mgcpsock_read(int *id, int fd, short events, void *ignore)
-{
-	struct mgcp_request req;
-	struct sockaddr_in sin;
-	struct mgcp_subchannel *sub;
-	int res;
-	socklen_t len;
-	int result;
-	int ident;
-	len = sizeof(sin);
-	memset(&req, 0, sizeof(req));
-	res = recvfrom(mgcpsock, req.data, sizeof(req.data) - 1, 0, (struct sockaddr *)&sin, &len);
-	if (res < 0) {
-		if (errno != ECONNREFUSED)
-			ast_log(LOG_WARNING, "Recv error: %s\n", strerror(errno));
-		return 1;
-	}
-	req.data[res] = '\0';
-	req.len = res;
-	ast_debug(1, "MGCP read: \n%s\nfrom %s:%d\n", req.data, ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port));
-	parse(&req);
-	if (req.headers < 1) {
-		/* Must have at least one header */
-		return 1;
-	}
-	if (ast_strlen_zero(req.identifier)) {
-		ast_log(LOG_NOTICE, "Message from %s missing identifier\n", ast_inet_ntoa(sin.sin_addr));
-		return 1;
-	}
-
-	if (sscanf(req.verb, "%30d", &result) && sscanf(req.identifier, "%30d", &ident)) {
-		if (result < 200) {
-			ast_debug(1, "Ignoring provisional response on transaction %d\n", ident);
-			return 1;
-		}
-		/* Try to find who this message is for, if it's important */
-		sub = find_subchannel_and_lock(NULL, ident, &sin);
-		if (sub) {
-			struct mgcp_gateway *gw = sub->parent->parent;
-			struct mgcp_message *cur, *prev;
-
-			ast_mutex_unlock(&sub->lock);
-			ast_mutex_lock(&gw->msgs_lock);
-			for (prev = NULL, cur = gw->msgs; cur; prev = cur, cur = cur->next) {
-				if (cur->seqno == ident) {
-					ast_debug(1, "Got response back on transaction %d\n", ident);
-					if (prev)
-						prev->next = cur->next;
-					else
-						gw->msgs = cur->next;
-					break;
-				}
-			}
-
-			/* stop retrans timer if the queue is empty */
-			if (!gw->msgs) {
-				AST_SCHED_DEL(sched, gw->retransid);
-			}
-
-			ast_mutex_unlock(&gw->msgs_lock);
-			if (cur) {
-				handle_response(cur->owner_ep, cur->owner_sub, result, ident, &req);
-				ast_free(cur);
-				return 1;
-			}
-
-			ast_log(LOG_NOTICE, "Got response back on [%s] for transaction %d we aren't sending?\n",
-				gw->name, ident);
-		}
-	} else {
-		if (ast_strlen_zero(req.endpoint) ||
-			ast_strlen_zero(req.version) ||
-			ast_strlen_zero(req.verb)) {
-			ast_log(LOG_NOTICE, "Message must have a verb, an idenitifier, version, and endpoint\n");
-			return 1;
-		}
-		/* Process request, with iflock held */
-		sub = find_subchannel_and_lock(req.endpoint, 0, &sin);
-		if (sub) {
-			/* look first to find a matching response in the queue */
-			if (!find_and_retrans(sub, &req))
-				/* pass the request off to the currently mastering subchannel */
-				handle_request(sub, &req, &sin);
-			ast_mutex_unlock(&sub->lock);
-		}
-	}
-	return 1;
-}
-
-static int *mgcpsock_read_id = NULL;
-
-static int mgcp_prune_realtime_gateway(struct mgcp_gateway *g)
-{
-	struct mgcp_endpoint *enext, *e;
-	struct mgcp_subchannel *s, *sub;
-	int i, prune = 1;
-
-	if (g->ha || !g->realtime || ast_mutex_trylock(&g->msgs_lock) || g->msgs) {
-		ast_mutex_unlock(&g->msgs_lock);
-		return 0;
-	}
-
-	for (e = g->endpoints; e; e = e->next) {
-		ast_mutex_lock(&e->lock);
-		if (e->dsp || ast_mutex_trylock(&e->rqnt_queue_lock) || ast_mutex_trylock(&e->cmd_queue_lock)) {
-			prune = 0;
-		} else if (e->rqnt_queue || e->cmd_queue) {
-			prune = 0;
-		}
-		s = e->sub;
-		for (i = 0; (i < MAX_SUBS) && s; i++) {
-			ast_mutex_lock(&s->lock);
-			if (!ast_strlen_zero(s->cxident) || s->rtp || ast_mutex_trylock(&s->cx_queue_lock) || s->gate) {
-				prune = 0;
-			} else if (s->cx_queue) {
-				prune = 0;
-			}
-			s = s->next;
-		}
-	}
-
-	for (e = g->endpoints, sub = e->sub, enext = e->next; e; e = enext, enext = e->next) {
-		for (i = 0; (i < MAX_SUBS) && sub; i++) {
-			s = sub;
-			sub = sub->next;
-			ast_mutex_unlock(&s->lock);
-			ast_mutex_unlock(&s->cx_queue_lock);
-			if (prune) {
-				ast_mutex_destroy(&s->lock);
-				ast_mutex_destroy(&s->cx_queue_lock);
-				ast_free(s);
-			}
-		}
-		ast_mutex_unlock(&e->lock);
-		ast_mutex_unlock(&e->rqnt_queue_lock);
-		ast_mutex_unlock(&e->cmd_queue_lock);
-		if (prune) {
-			ast_mutex_destroy(&e->lock);
-			ast_mutex_destroy(&e->rqnt_queue_lock);
-			ast_mutex_destroy(&e->cmd_queue_lock);
-			ast_free(e);
-		}
-	}
-	if (prune) {
-		ast_debug(1, "***** MGCP REALTIME PRUNE GW: %s\n", g->name);
-	}
-	return prune;
-}
-
-static void *do_monitor(void *data)
-{
-	int res;
-	int reloading;
-	struct mgcp_gateway *g, *gprev;
-	/*struct mgcp_gateway *g;*/
-	/*struct mgcp_endpoint *e;*/
-	/*time_t thispass = 0, lastpass = 0;*/
-	time_t lastrun = 0;
-
-	/* Add an I/O event to our UDP socket */
-	if (mgcpsock > -1) {
-		mgcpsock_read_id = ast_io_add(io, mgcpsock, mgcpsock_read, AST_IO_IN, NULL);
-	}
-	/* This thread monitors all the frame relay interfaces which are not yet in use
-	   (and thus do not have a separate thread) indefinitely */
-	/* From here on out, we die whenever asked */
-	for (;;) {
-		/* Check for a reload request */
-		ast_mutex_lock(&mgcp_reload_lock);
-		reloading = mgcp_reloading;
-		mgcp_reloading = 0;
-		ast_mutex_unlock(&mgcp_reload_lock);
-		if (reloading) {
-			ast_verb(1, "Reloading MGCP\n");
-			reload_config(1);
-			/* Add an I/O event to our UDP socket */
-			if (mgcpsock > -1 && !mgcpsock_read_id) {
-				mgcpsock_read_id = ast_io_add(io, mgcpsock, mgcpsock_read, AST_IO_IN, NULL);
-			}
-		}
-
-		/* Check for interfaces needing to be killed */
-		/* Don't let anybody kill us right away.  Nobody should lock the interface list
-		   and wait for the monitor list, but the other way around is okay. */
-		ast_mutex_lock(&monlock);
-		/* Lock the network interface */
-		ast_mutex_lock(&netlock);
-
-#if 0
-		/* XXX THIS IS COMPLETELY HOSED */
-		/* The gateway goes into a state of panic */
-		/* If the vmwi indicator is sent while it is reseting interfaces */
-		lastpass = thispass;
-		thispass = time(NULL);
-		g = gateways;
-		while(g) {
-			if (thispass != lastpass) {
-				e = g->endpoints;
-				while(e) {
-					if (e->type == TYPE_LINE) {
-						res = has_voicemail(e);
-						if ((e->msgstate != res) && (e->hookstate == MGCP_ONHOOK) && (!e->rtp)){
-							if (res) {
-								transmit_notify_request(e, "L/vmwi(+)");
-							} else {
-								transmit_notify_request(e, "L/vmwi(-)");
-							}
-							e->msgstate = res;
-							e->onhooktime = thispass;
-						}
-					}
-					e = e->next;
-				}
-			}
-			g = g->next;
-		}
-#endif
-		/* pruning unused realtime gateways, running in every 60 seconds*/
-		if(time(NULL) > (lastrun + 60)) {
-			ast_mutex_lock(&gatelock);
-			g = gateways;
-			gprev = NULL;
-			while(g) {
-				if(g->realtime) {
-					if(mgcp_prune_realtime_gateway(g)) {
-						if(gprev) {
-							gprev->next = g->next;
-						} else {
-							gateways = g->next;
-						}
-						ast_mutex_unlock(&g->msgs_lock);
-						ast_mutex_destroy(&g->msgs_lock);
-						ast_free(g);
-					} else {
-						ast_mutex_unlock(&g->msgs_lock);
-						gprev = g;
-					}
-				} else {
-					gprev = g;
-				}
-				g = g->next;
-			}
-			ast_mutex_unlock(&gatelock);
-			lastrun = time(NULL);
-		}
-		/* Okay, now that we know what to do, release the network lock */
-		ast_mutex_unlock(&netlock);
-		/* And from now on, we're okay to be killed, so release the monitor lock as well */
-		ast_mutex_unlock(&monlock);
-		pthread_testcancel();
-		/* Wait for sched or io */
-		res = ast_sched_wait(sched);
-		/* copied from chan_sip.c */
-		if ((res < 0) || (res > 1000)) {
-			res = 1000;
-		}
-		res = ast_io_wait(io, res);
-		ast_mutex_lock(&monlock);
-		if (res >= 0) {
-			ast_sched_runq(sched);
-		}
-		ast_mutex_unlock(&monlock);
-	}
-	/* Never reached */
-	return NULL;
-}
-
-static int restart_monitor(void)
-{
-	/* If we're supposed to be stopped -- stay stopped */
-	if (monitor_thread == AST_PTHREADT_STOP)
-		return 0;
-	if (ast_mutex_lock(&monlock)) {
-		ast_log(LOG_WARNING, "Unable to lock monitor\n");
-		return -1;
-	}
-	if (monitor_thread == pthread_self()) {
-		ast_mutex_unlock(&monlock);
-		ast_log(LOG_WARNING, "Cannot kill myself\n");
-		return -1;
-	}
-	if (monitor_thread != AST_PTHREADT_NULL) {
-		/* Wake up the thread */
-		pthread_kill(monitor_thread, SIGURG);
-	} else {
-		/* Start a new monitor */
-		if (ast_pthread_create_background(&monitor_thread, NULL, do_monitor, NULL) < 0) {
-			ast_mutex_unlock(&monlock);
-			ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
-			return -1;
-		}
-	}
-	ast_mutex_unlock(&monlock);
-	return 0;
-}
-
-static struct ast_channel *mgcp_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *dest, int *cause)
-{
-	struct mgcp_subchannel *sub;
-	struct ast_channel *tmpc = NULL;
-	char tmp[256];
-
-	if (!(ast_format_cap_iscompatible(cap, global_capability))) {
-		struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
-		ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n",
-			ast_format_cap_get_names(cap, &cap_buf));
-		/*return NULL;*/
-	}
-	ast_copy_string(tmp, dest, sizeof(tmp));
-	if (ast_strlen_zero(tmp)) {
-		ast_log(LOG_NOTICE, "MGCP Channels require an endpoint\n");
-		return NULL;
-	}
-	if (!(sub = find_subchannel_and_lock(tmp, 0, NULL))) {
-		ast_log(LOG_WARNING, "Unable to find MGCP endpoint '%s'\n", tmp);
-		*cause = AST_CAUSE_UNREGISTERED;
-		return NULL;
-	}
-
-	ast_verb(3, "MGCP mgcp_request(%s)\n", tmp);
-	ast_verb(3, "MGCP cw: %d, dnd: %d, so: %d, sno: %d\n",
-			sub->parent->callwaiting, sub->parent->dnd, sub->owner ? 1 : 0, sub->next->owner ? 1: 0);
-	/* Must be busy */
-	if (((sub->parent->callwaiting) && ((sub->owner) && (sub->next->owner))) ||
-		((!sub->parent->callwaiting) && (sub->owner)) ||
-		 (sub->parent->dnd && (ast_strlen_zero(sub->parent->call_forward)))) {
-		if (sub->parent->hookstate == MGCP_ONHOOK) {
-			if (has_voicemail(sub->parent)) {
-				transmit_notify_request(sub,"L/vmwi(+)");
-			} else {
-				transmit_notify_request(sub,"L/vmwi(-)");
-			}
-		}
-		*cause = AST_CAUSE_BUSY;
-		ast_mutex_unlock(&sub->lock);
-		return NULL;
-	}
-	tmpc = mgcp_new(sub->owner ? sub->next : sub, AST_STATE_DOWN, assignedids, requestor);
-	ast_mutex_unlock(&sub->lock);
-	if (!tmpc)
-		ast_log(LOG_WARNING, "Unable to make channel for '%s'\n", tmp);
-	restart_monitor();
-	return tmpc;
-}
-
-/* modified for reload support */
-/*! \brief  build_gateway: parse mgcp.conf and create gateway/endpoint structures */
-static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
-{
-	struct mgcp_gateway *gw;
-	struct mgcp_endpoint *e;
-	struct mgcp_subchannel *sub;
-	struct ast_variable *chanvars = NULL;
-
-	/*char txident[80];*/
-	int i=0, y=0;
-	int gw_reload = 0;
-	int ep_reload = 0;
-	directmedia = DIRECTMEDIA;
-
-	/* locate existing gateway */
-	for (gw = gateways; gw; gw = gw->next) {
-		if (!strcasecmp(cat, gw->name)) {
-			/* gateway already exists */
-			gw->delme = 0;
-			gw_reload = 1;
-			break;
-		}
-	}
-
-	if (!gw && !(gw = ast_calloc(1, sizeof(*gw)))) {
-		return NULL;
-	}
-
-	if (!gw_reload) {
-		gw->expire = -1;
-		gw->realtime = 0;
-		gw->retransid = -1;
-		ast_mutex_init(&gw->msgs_lock);
-		ast_copy_string(gw->name, cat, sizeof(gw->name));
-		/* check if the name is numeric ip */
-		if ((strchr(gw->name, '.')) && inet_addr(gw->name) != INADDR_NONE)
-			gw->isnamedottedip = 1;
-	}
-	for (; v; v = v->next) {
-		if (!strcasecmp(v->name, "host")) {
-			if (!strcasecmp(v->value, "dynamic")) {
-				/* They'll register with us */
-				gw->dynamic = 1;
-				memset(&gw->addr.sin_addr, 0, 4);
-				if (gw->addr.sin_port) {
-					/* If we've already got a port, make it the default rather than absolute */
-					gw->defaddr.sin_port = gw->addr.sin_port;
-					gw->addr.sin_port = 0;
-				}
-			} else {
-				/* Non-dynamic.  Make sure we become that way if we're not */
-				AST_SCHED_DEL(sched, gw->expire);
-				gw->dynamic = 0;
-				{
-					struct ast_sockaddr tmp;
-
-					ast_sockaddr_from_sin(&tmp, &gw->addr);
-					if (ast_get_ip(&tmp, v->value)) {
-						if (!gw_reload) {
-							ast_mutex_destroy(&gw->msgs_lock);
-							ast_free(gw);
-						}
-						return NULL;
-					}
-					ast_sockaddr_to_sin(&tmp, &gw->addr);
-				}
-			}
-		} else if (!strcasecmp(v->name, "defaultip")) {
-			struct ast_sockaddr tmp;
-
-			ast_sockaddr_from_sin(&tmp, &gw->defaddr);
-			if (ast_get_ip(&tmp, v->value)) {
-				if (!gw_reload) {
-					ast_mutex_destroy(&gw->msgs_lock);
-					ast_free(gw);
-				}
-				return NULL;
-			}
-			ast_sockaddr_to_sin(&tmp, &gw->defaddr);
-		} else if (!strcasecmp(v->name, "permit") ||
-			!strcasecmp(v->name, "deny")) {
-			int acl_error = 0;
-			gw->ha = ast_append_ha(v->name, v->value, gw->ha, &acl_error);
-			if (acl_error) {
-				ast_log(LOG_ERROR, "Invalid ACL '%s' specified for MGCP gateway '%s' on line %d. Not creating.\n",
-						v->value, cat, v->lineno);
-				if (!gw_reload) {
-					ast_mutex_destroy(&gw->msgs_lock);
-					ast_free(gw);
-				} else {
-					gw->delme = 1;
-				}
-				return NULL;
-			}
-		} else if (!strcasecmp(v->name, "port")) {
-			gw->addr.sin_port = htons(atoi(v->value));
-		} else if (!strcasecmp(v->name, "context")) {
-			ast_copy_string(context, v->value, sizeof(context));
-		} else if (!strcasecmp(v->name, "dtmfmode")) {
-			if (!strcasecmp(v->value, "inband"))
-				dtmfmode = MGCP_DTMF_INBAND;
-			else if (!strcasecmp(v->value, "rfc2833"))
-				dtmfmode = MGCP_DTMF_RFC2833;
-			else if (!strcasecmp(v->value, "hybrid"))
-				dtmfmode = MGCP_DTMF_HYBRID;
-			else if (!strcasecmp(v->value, "none"))
-				dtmfmode = 0;
-			else
-				ast_log(LOG_WARNING, "'%s' is not a valid DTMF mode at line %d\n", v->value, v->lineno);
-		} else if (!strcasecmp(v->name, "nat")) {
-			nat = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "ncs")) {
-			ncs = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "hangupongateremove")) {
-			hangupongateremove = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "pktcgatealloc")) {
-			pktcgatealloc = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "callerid")) {
-			if (!strcasecmp(v->value, "asreceived")) {
-				cid_num[0] = '\0';
-				cid_name[0] = '\0';
-			} else {
-				ast_callerid_split(v->value, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num));
-			}
-		} else if (!strcasecmp(v->name, "language")) {
-			ast_copy_string(language, v->value, sizeof(language));
-		} else if (!strcasecmp(v->name, "accountcode")) {
-			ast_copy_string(accountcode, v->value, sizeof(accountcode));
-		} else if (!strcasecmp(v->name, "amaflags")) {
-			y = ast_channel_string2amaflag(v->value);
-			if (y < 0) {
-				ast_log(LOG_WARNING, "Invalid AMA flags: %s at line %d\n", v->value, v->lineno);
-			} else {
-				amaflags = y;
-			}
-		} else if (!strcasecmp(v->name, "setvar")) {
-			chanvars = add_var(v->value, chanvars);
-		} else if (!strcasecmp(v->name, "clearvars")) {
-			if (chanvars) {
-				ast_variables_destroy(chanvars);
-				chanvars = NULL;
-			}
-		} else if (!strcasecmp(v->name, "musiconhold")) {
-			ast_copy_string(musicclass, v->value, sizeof(musicclass));
-		} else if (!strcasecmp(v->name, "parkinglot")) {
-			ast_copy_string(parkinglot, v->value, sizeof(parkinglot));
-		} else if (!strcasecmp(v->name, "callgroup")) {
-			cur_callergroup = ast_get_group(v->value);
-		} else if (!strcasecmp(v->name, "pickupgroup")) {
-			cur_pickupgroup = ast_get_group(v->value);
-		} else if (!strcasecmp(v->name, "immediate")) {
-			immediate = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "cancallforward")) {
-			cancallforward = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "singlepath")) {
-			singlepath = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "directmedia") || !strcasecmp(v->name, "canreinvite")) {
-			directmedia = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "mailbox")) {
-			ast_copy_string(mailbox, v->value, sizeof(mailbox));
-		} else if (!strcasecmp(v->name, "hasvoicemail")) {
-			if (ast_true(v->value) && ast_strlen_zero(mailbox)) {
-				/*
-				 * hasvoicemail is a users.conf legacy voicemail enable method.
-				 * hasvoicemail is only going to work for app_voicemail mailboxes.
-				 */
-				if (strchr(gw->name, '@')) {
-					ast_copy_string(mailbox, gw->name, sizeof(mailbox));
-				} else {
-					snprintf(mailbox, sizeof(mailbox), "%s at default", gw->name);
-				}
-			}
-		} else if (!strcasecmp(v->name, "adsi")) {
-			adsi = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "callreturn")) {
-			callreturn = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "callwaiting")) {
-			callwaiting = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "slowsequence")) {
-			slowsequence = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "transfer")) {
-			transfer = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "threewaycalling")) {
-			threewaycalling = ast_true(v->value);
-		} else if (!strcasecmp(v->name, "wcardep")) {
-			/* locate existing endpoint */
-			for (e = gw->endpoints; e; e = e->next) {
-				if (!strcasecmp(v->value, e->name)) {
-					/* endpoint already exists */
-					e->delme = 0;
-					ep_reload = 1;
-					break;
-				}
-			}
-
-			if (!e) {
-				/* Allocate wildcard endpoint */
-				e = ast_calloc(1, sizeof(*e));
-				ep_reload = 0;
-			}
-
-			if (e) {
-				if (!ep_reload) {
-					memset(e, 0, sizeof(struct mgcp_endpoint));
-					ast_mutex_init(&e->lock);
-					ast_mutex_init(&e->rqnt_queue_lock);
-					ast_mutex_init(&e->cmd_queue_lock);
-					e->cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-					ast_copy_string(e->name, v->value, sizeof(e->name));
-					e->needaudit = 1;
-				}
-				ast_copy_string(gw->wcardep, v->value, sizeof(gw->wcardep));
-				/* XXX Should we really check for uniqueness?? XXX */
-				ast_copy_string(e->accountcode, accountcode, sizeof(e->accountcode));
-				ast_copy_string(e->context, context, sizeof(e->context));
-				ast_copy_string(e->cid_num, cid_num, sizeof(e->cid_num));
-				ast_copy_string(e->cid_name, cid_name, sizeof(e->cid_name));
-				ast_copy_string(e->language, language, sizeof(e->language));
-				ast_copy_string(e->musicclass, musicclass, sizeof(e->musicclass));
-				ast_copy_string(e->mailbox, mailbox, sizeof(e->mailbox));
-				ast_copy_string(e->parkinglot, parkinglot, sizeof(e->parkinglot));
-				if (!ast_strlen_zero(e->mailbox)) {
-					/* This module does not handle MWI in an event-based manner.  However, it
-					 * subscribes to MWI for each mailbox that is configured so that the core
-					 * knows that we care about it.  Then, chan_mgcp will get the MWI from the
-					 * event cache instead of checking the mailbox directly. */
-					e->mwi_event_sub = ast_mwi_subscribe_pool(e->mailbox, stasis_subscription_cb_noop, NULL);
-				}
-				snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08lx", (unsigned long)ast_random());
-				e->msgstate = -1;
-				e->amaflags = amaflags;
-				ast_format_cap_append_from_cap(e->cap, global_capability, AST_MEDIA_TYPE_UNKNOWN);
-				e->parent = gw;
-				e->ncs = ncs;
-				e->dtmfmode = dtmfmode;
-				if (!ep_reload && e->sub && e->sub->rtp) {
-					e->dtmfmode |= MGCP_DTMF_INBAND;
-				}
-				e->adsi = adsi;
-				e->type = TYPE_LINE;
-				e->immediate = immediate;
-				e->callgroup=cur_callergroup;
-				e->pickupgroup=cur_pickupgroup;
-				e->callreturn = callreturn;
-				e->cancallforward = cancallforward;
-				e->singlepath = singlepath;
-				e->directmedia = directmedia;
-				e->callwaiting = callwaiting;
-				e->hascallwaiting = callwaiting;
-				e->slowsequence = slowsequence;
-				e->transfer = transfer;
-				e->threewaycalling = threewaycalling;
-				e->onhooktime = time(NULL);
-				/* ASSUME we're onhook */
-				e->hookstate = MGCP_ONHOOK;
-				e->chanvars = copy_vars(chanvars);
-				if (!ep_reload) {
-					/*snprintf(txident, sizeof(txident), "%08lx", (unsigned long)ast_random());*/
-					for (i = 0; i < MAX_SUBS; i++) {
-						sub = ast_calloc(1, sizeof(*sub));
-						if (sub) {
-							ast_verb(3, "Allocating subchannel '%d' on %s@%s\n", i, e->name, gw->name);
-							ast_mutex_init(&sub->lock);
-							ast_mutex_init(&sub->cx_queue_lock);
-							sub->parent = e;
-							sub->id = i;
-							snprintf(sub->txident, sizeof(sub->txident), "%08lx", (unsigned long)ast_random());
-							/*stnrcpy(sub->txident, txident, sizeof(sub->txident) - 1);*/
-							sub->cxmode = MGCP_CX_INACTIVE;
-							sub->nat = nat;
-							sub->gate = NULL;
-							sub->sdpsent = 0;
-							sub->next = e->sub;
-							e->sub = sub;
-						} else {
-							/* XXX Should find a way to clean up our memory */
-							ast_log(LOG_WARNING, "Out of memory allocating subchannel\n");
-							return NULL;
-						}
-					}
-					/* Make out subs a circular linked list so we can always sping through the whole bunch */
-					/* find the end of the list */
-					for (sub = e->sub; sub && sub->next; sub = sub->next);
-					/* set the last sub->next to the first sub */
-					sub->next = e->sub;
-
-					e->next = gw->endpoints;
-					gw->endpoints = e;
-				}
-			}
-		} else if (!strcasecmp(v->name, "trunk") ||
-		           !strcasecmp(v->name, "line")) {
-
-			/* locate existing endpoint */
-			for (e = gw->endpoints; e; e = e->next) {
-				if (!strcasecmp(v->value, e->name)) {
-					/* endpoint already exists */
-					e->delme = 0;
-					ep_reload = 1;
-					break;
-				}
-			}
-
-			if (!e) {
-				e = ast_calloc(1, sizeof(*e));
-				ep_reload = 0;
-			}
-
-			if (e) {
-				if (!ep_reload) {
-					ast_mutex_init(&e->lock);
-					ast_mutex_init(&e->rqnt_queue_lock);
-					ast_mutex_init(&e->cmd_queue_lock);
-					e->cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-					ast_copy_string(e->name, v->value, sizeof(e->name));
-					e->needaudit = 1;
-				}
-				/* XXX Should we really check for uniqueness?? XXX */
-				ast_copy_string(e->accountcode, accountcode, sizeof(e->accountcode));
-				ast_copy_string(e->context, context, sizeof(e->context));
-				ast_copy_string(e->cid_num, cid_num, sizeof(e->cid_num));
-				ast_copy_string(e->cid_name, cid_name, sizeof(e->cid_name));
-				ast_copy_string(e->language, language, sizeof(e->language));
-				ast_copy_string(e->musicclass, musicclass, sizeof(e->musicclass));
-				ast_copy_string(e->mailbox, mailbox, sizeof(e->mailbox));
-				ast_copy_string(e->parkinglot, parkinglot, sizeof(e->parkinglot));
-				if (!ast_strlen_zero(mailbox)) {
-					ast_verb(3, "Setting mailbox '%s' on %s@%s\n", mailbox, gw->name, e->name);
-				}
-				if (!ep_reload) {
-					/* XXX potential issue due to reload */
-					e->msgstate = -1;
-					e->parent = gw;
-				}
-				e->amaflags = amaflags;
-				ast_format_cap_append_from_cap(e->cap, global_capability, AST_MEDIA_TYPE_UNKNOWN);
-				e->dtmfmode = dtmfmode;
-				e->ncs = ncs;
-				e->pktcgatealloc = pktcgatealloc;
-				e->hangupongateremove = hangupongateremove;
-				e->adsi = adsi;
-				e->type = (!strcasecmp(v->name, "trunk")) ? TYPE_TRUNK : TYPE_LINE;
-				e->immediate = immediate;
-				e->callgroup=cur_callergroup;
-				e->pickupgroup=cur_pickupgroup;
-				e->callreturn = callreturn;
-				e->cancallforward = cancallforward;
-				e->directmedia = directmedia;
-				e->singlepath = singlepath;
-				e->callwaiting = callwaiting;
-				e->hascallwaiting = callwaiting;
-				e->slowsequence = slowsequence;
-				e->transfer = transfer;
-				e->threewaycalling = threewaycalling;
-
-				/* If we already have a valid chanvars, it's not a new endpoint (it's a reload),
-				   so first, free previous mem
-				 */
-				if (e->chanvars) {
-					ast_variables_destroy(e->chanvars);
-					e->chanvars = NULL;
-				}
-				e->chanvars = copy_vars(chanvars);
-
-				if (!ep_reload) {
-					e->onhooktime = time(NULL);
-					/* ASSUME we're onhook */
-					e->hookstate = MGCP_ONHOOK;
-					snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08lx", (unsigned long)ast_random());
-				}
-
-				for (i = 0, sub = NULL; i < MAX_SUBS; i++) {
-					if (!ep_reload) {
-						sub = ast_calloc(1, sizeof(*sub));
-					} else {
-						if (!sub) {
-							sub = e->sub;
-						} else {
-							sub = sub->next;
-						}
-					}
-
-					if (sub) {
-						if (!ep_reload) {
-							ast_verb(3, "Allocating subchannel '%d' on %s@%s\n", i, e->name, gw->name);
-							ast_mutex_init(&sub->lock);
-							ast_mutex_init(&sub->cx_queue_lock);
-							ast_copy_string(sub->magic, MGCP_SUBCHANNEL_MAGIC, sizeof(sub->magic));
-							sub->parent = e;
-							sub->id = i;
-							snprintf(sub->txident, sizeof(sub->txident), "%08lx", (unsigned long)ast_random());
-							sub->cxmode = MGCP_CX_INACTIVE;
-							sub->next = e->sub;
-							e->sub = sub;
-						}
-						sub->nat = nat;
-					} else {
-						/* XXX Should find a way to clean up our memory */
-						ast_log(LOG_WARNING, "Out of memory allocating subchannel\n");
-						return NULL;
-					}
-				}
-				if (!ep_reload) {
-					/* Make out subs a circular linked list so we can always sping through the whole bunch */
-					/* find the end of the list */
-					for (sub = e->sub; sub && sub->next; sub = sub->next);
-					/* set the last sub->next to the first sub */
-					sub->next = e->sub;
-
-					e->next = gw->endpoints;
-					gw->endpoints = e;
-				}
-			}
-		} else if (!strcasecmp(v->name, "name") || !strcasecmp(v->name, "lines")) {
-			/* just eliminate realtime warnings */
-		} else {
-			ast_log(LOG_WARNING, "Don't know keyword '%s' at line %d\n", v->name, v->lineno);
-		}
-	}
-	if (!ntohl(gw->addr.sin_addr.s_addr) && !gw->dynamic) {
-		ast_log(LOG_WARNING, "Gateway '%s' lacks IP address and isn't dynamic\n", gw->name);
-		if (!gw_reload) {
-			ast_mutex_destroy(&gw->msgs_lock);
-			ast_free(gw);
-		}
-
-		/* Return NULL */
-		gw_reload = 1;
-	} else {
-		gw->defaddr.sin_family = AF_INET;
-		gw->addr.sin_family = AF_INET;
-		if (gw->defaddr.sin_addr.s_addr && !ntohs(gw->defaddr.sin_port)) {
-			gw->defaddr.sin_port = htons(DEFAULT_MGCP_GW_PORT);
-		}
-		if (gw->addr.sin_addr.s_addr && !ntohs(gw->addr.sin_port)) {
-			gw->addr.sin_port = htons(DEFAULT_MGCP_GW_PORT);
-		}
-		{
-			struct ast_sockaddr tmp1, tmp2;
-			struct sockaddr_in tmp3 = {0,};
-
-			tmp3.sin_addr = gw->ourip;
-			ast_sockaddr_from_sin(&tmp1, &gw->addr);
-			ast_sockaddr_from_sin(&tmp2, &tmp3);
-			if (gw->addr.sin_addr.s_addr && ast_ouraddrfor(&tmp1, &tmp2)) {
-				memcpy(&gw->ourip, &__ourip, sizeof(gw->ourip));
-			} else {
-				ast_sockaddr_to_sin(&tmp2, &tmp3);
-				gw->ourip = tmp3.sin_addr;
-			}
-		}
-	}
-
-	if (chanvars) {
-		ast_variables_destroy(chanvars);
-		chanvars = NULL;
-	}
-	return (gw_reload ? NULL : gw);
-}
-
-static enum ast_rtp_glue_result mgcp_get_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance **instance)
-{
-	struct mgcp_subchannel *sub = NULL;
-
-	if (!(sub = ast_channel_tech_pvt(chan)) || !(sub->rtp))
-		return AST_RTP_GLUE_RESULT_FORBID;
-
-	ao2_ref(sub->rtp, +1);
-	*instance = sub->rtp;
-
-	if (sub->parent->directmedia)
-		return AST_RTP_GLUE_RESULT_REMOTE;
-	else
-		return AST_RTP_GLUE_RESULT_LOCAL;
-}
-
-static int mgcp_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *rtp, struct ast_rtp_instance *vrtp, struct ast_rtp_instance *trtp, const struct ast_format_cap *cap, int nat_active)
-{
-	/* XXX Is there such thing as video support with MGCP? XXX */
-	struct mgcp_subchannel *sub;
-	sub = ast_channel_tech_pvt(chan);
-	if (sub && !sub->alreadygone) {
-		transmit_modify_with_sdp(sub, rtp, cap);
-		return 0;
-	}
-	return -1;
-}
-
-static void mgcp_get_codec(struct ast_channel *chan, struct ast_format_cap *result)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(chan);
-	struct mgcp_endpoint *p = sub->parent;
-
-	ast_format_cap_append_from_cap(result, p->cap, AST_MEDIA_TYPE_UNKNOWN);
-}
-
-static struct ast_rtp_glue mgcp_rtp_glue = {
-	.type = "MGCP",
-	.get_rtp_info = mgcp_get_rtp_peer,
-	.update_peer = mgcp_set_rtp_peer,
-	.get_codec = mgcp_get_codec,
-};
-
-
-static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *args, char *buf, size_t buflen)
-{
-	struct mgcp_subchannel *sub = ast_channel_tech_pvt(chan);
-	int res = 0;
-
-	/* Sanity check */
-	if (!chan || ast_channel_tech(chan) != &mgcp_tech) {
-		ast_log(LOG_ERROR, "This function requires a valid MGCP channel\n");
-		return -1;
-	}
-
-	if (!strcasecmp(args, "ncs")) {
-		snprintf(buf, buflen, "%s", sub->parent->ncs ?  "yes":"no");
-	} else {
-		res = -1;
-	}
-	return res;
-}
-
-
-static void destroy_endpoint(struct mgcp_endpoint *e)
-{
-	struct mgcp_subchannel *sub = e->sub->next, *s;
-	int i;
-
-	for (i = 0; i < MAX_SUBS; i++) {
-		ast_mutex_lock(&sub->lock);
-		if (!ast_strlen_zero(sub->cxident)) {
-			transmit_connection_del(sub);
-		}
-		if (sub->rtp) {
-			ast_rtp_instance_destroy(sub->rtp);
-			sub->rtp = NULL;
-		}
-		memset(sub->magic, 0, sizeof(sub->magic));
-		mgcp_queue_hangup(sub);
-		dump_cmd_queues(NULL, sub);
-		if(sub->gate) {
-			sub->gate->tech_pvt = NULL;
-			sub->gate->got_dq_gi = NULL;
-			sub->gate->gate_remove = NULL;
-			sub->gate->gate_open = NULL;
-		}
-		ast_mutex_unlock(&sub->lock);
-		sub = sub->next;
-	}
-
-	if (e->dsp) {
-		ast_dsp_free(e->dsp);
-	}
-
-	dump_queue(e->parent, e);
-	dump_cmd_queues(e, NULL);
-
-	sub = e->sub;
-	for (i = 0; (i < MAX_SUBS) && sub; i++) {
-		s = sub;
-		sub = sub->next;
-		ast_mutex_destroy(&s->lock);
-		ast_mutex_destroy(&s->cx_queue_lock);
-		ast_free(s);
-	}
-
-	if (e->mwi_event_sub) {
-		e->mwi_event_sub = ast_mwi_unsubscribe(e->mwi_event_sub);
-	}
-
-	if (e->chanvars) {
-		ast_variables_destroy(e->chanvars);
-		e->chanvars = NULL;
-	}
-
-	ast_mutex_destroy(&e->lock);
-	ast_mutex_destroy(&e->rqnt_queue_lock);
-	ast_mutex_destroy(&e->cmd_queue_lock);
-	ao2_ref(e->cap, -1);
-	ast_free(e);
-}
-
-static void destroy_gateway(struct mgcp_gateway *g)
-{
-	if (g->ha)
-		ast_free_ha(g->ha);
-
-	dump_queue(g, NULL);
-
-	ast_free(g);
-}
-
-static void prune_gateways(void)
-{
-	struct mgcp_gateway *g, *z, *r;
-	struct mgcp_endpoint *e, *p, *t;
-
-	ast_mutex_lock(&gatelock);
-
-	/* prune gateways */
-	for (z = NULL, g = gateways; g;) {
-		/* prune endpoints */
-		for (p = NULL, e = g->endpoints; e; ) {
-			if (!g->realtime && (e->delme || g->delme)) {
-				t = e;
-				e = e->next;
-				if (!p)
-					g->endpoints = e;
-				else
-					p->next = e;
-				destroy_endpoint(t);
-			} else {
-				p = e;
-				e = e->next;
-			}
-		}
-
-		if (g->delme) {
-			r = g;
-			g = g->next;
-			if (!z)
-				gateways = g;
-			else
-				z->next = g;
-
-			destroy_gateway(r);
-		} else {
-			z = g;
-			g = g->next;
-		}
-	}
-
-	ast_mutex_unlock(&gatelock);
-}
-
-static struct ast_variable *add_var(const char *buf, struct ast_variable *list)
-{
-	struct ast_variable *tmpvar = NULL;
-	char *varname = ast_strdupa(buf), *varval = NULL;
-
-	if ((varval = strchr(varname, '='))) {
-		*varval++ = '\0';
-		if ((tmpvar = ast_variable_new(varname, varval, ""))) {
-			tmpvar->next = list;
-			list = tmpvar;
-		}
-	}
-	return list;
-}
-
-/*! \brief
- * duplicate a list of channel variables, \return the copy.
- */
-static struct ast_variable *copy_vars(struct ast_variable *src)
-{
-	struct ast_variable *res = NULL, *tmp, *v = NULL;
-
-	for (v = src ; v ; v = v->next) {
-		if ((tmp = ast_variable_new(v->name, v->value, v->file))) {
-			tmp->next = res;
-			res = tmp;
-		}
-	}
-	return res;
-}
-
-/*!
- * \brief Resolve the given hostname and save its IPv4 address.
- *
- * \param[in]  hostname The hostname to resolve.
- * \param[out] sin_addr Pointer to a <tt>struct in_addr</tt> in which to
- *                      store the resolved IPv4 address. \c sin_addr will
- *                      not be changed if resolution fails.
- *
- * \retval 0 if successful
- * \retval 1 on failure
- */
-static int resolve_first_addr(const char *hostname, struct in_addr *sin_addr)
-{
-	struct ast_sockaddr addr = { {0,} };
-	struct sockaddr_in tmp;
-
-	if (ast_sockaddr_resolve_first_af(&addr, hostname, PARSE_PORT_FORBID, AF_INET)) {
-		return 1;
-	}
-
-	ast_sockaddr_to_sin(&addr, &tmp);
-	*sin_addr = tmp.sin_addr;
-	return 0;
-}
-
-static int reload_config(int reload)
-{
-	struct ast_config *cfg;
-	struct ast_variable *v;
-	struct mgcp_gateway *g;
-	struct mgcp_endpoint *e;
-	char *cat;
-	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
-
-	if (gethostname(ourhost, sizeof(ourhost)-1)) {
-		ast_log(LOG_WARNING, "Unable to get hostname, MGCP disabled\n");
-		return 0;
-	}
-	cfg = ast_config_load(config, config_flags);
-
-	/* We *must* have a config file otherwise stop immediately */
-	if (!cfg) {
-		ast_log(LOG_NOTICE, "Unable to load config %s, MGCP disabled\n", config);
-		return 0;
-	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
-		return 0;
-	} else if (cfg == CONFIG_STATUS_FILEINVALID) {
-		ast_log(LOG_ERROR, "Config file %s is in an invalid format.  Aborting.\n", config);
-		return 0;
-	}
-
-	memset(&bindaddr, 0, sizeof(bindaddr));
-	dtmfmode = 0;
-
-	/* Copy the default jb config over global_jbconf */
-	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
-
-	for (v = ast_variable_browse(cfg, "general"); v; v = v->next) {
-		/* handle jb conf */
-		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value)) {
-			continue;
-		}
-
-		/* Create the interface list */
-		if (!strcasecmp(v->name, "bindaddr")) {
-			if (resolve_first_addr(v->value, &bindaddr.sin_addr)) {
-				ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
-			}
-		} else if (!strcasecmp(v->name, "allow")) {
-			ast_format_cap_update_by_allow_disallow(global_capability, v->value, 1);
-		} else if (!strcasecmp(v->name, "disallow")) {
-			ast_format_cap_update_by_allow_disallow(global_capability, v->value, 0);
-		} else if (!strcasecmp(v->name, "tos")) {
-			if (ast_str2tos(v->value, &qos.tos)) {
-			    ast_log(LOG_WARNING, "Invalid tos value at line %d, refer to QoS documentation\n", v->lineno);
-			}
-		} else if (!strcasecmp(v->name, "tos_audio")) {
-			if (ast_str2tos(v->value, &qos.tos_audio))
-			    ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, refer to QoS documentation\n", v->lineno);
-		} else if (!strcasecmp(v->name, "cos")) {
-			if (ast_str2cos(v->value, &qos.cos))
-			    ast_log(LOG_WARNING, "Invalid cos value at line %d, refer to QoS documentation\n", v->lineno);
-		} else if (!strcasecmp(v->name, "cos_audio")) {
-			if (ast_str2cos(v->value, &qos.cos_audio))
-			    ast_log(LOG_WARNING, "Invalid cos_audio value at line %d, refer to QoS documentation\n", v->lineno);
-		} else if (!strcasecmp(v->name, "port")) {
-			if (sscanf(v->value, "%5d", &ourport) == 1) {
-				bindaddr.sin_port = htons(ourport);
-			} else {
-				ast_log(LOG_WARNING, "Invalid port number '%s' at line %d of %s\n", v->value, v->lineno, config);
-			}
-		} else if (!strcasecmp(v->name, "firstdigittimeout")) {
-			firstdigittimeout = atoi(v->value);
-		} else if (!strcasecmp(v->name, "gendigittimeout")) {
-			gendigittimeout = atoi(v->value);
-		} else if (!strcasecmp(v->name, "matchdigittimeout")) {
-			matchdigittimeout = atoi(v->value);
-		}
-	}
-
-	/* mark existing entries for deletion */
-	ast_mutex_lock(&gatelock);
-	for (g = gateways; g; g = g->next) {
-		g->delme = 1;
-		for (e = g->endpoints; e; e = e->next) {
-			e->delme = 1;
-		}
-	}
-	ast_mutex_unlock(&gatelock);
-
-	for (cat = ast_category_browse(cfg, NULL); cat; cat = ast_category_browse(cfg, cat)) {
-		if (strcasecmp(cat, "general")) {
-			ast_mutex_lock(&gatelock);
-			if ((g = build_gateway(cat, ast_variable_browse(cfg, cat)))) {
-				ast_verb(3, "Added gateway '%s'\n", g->name);
-				g->next = gateways;
-				gateways = g;
-			}
-			ast_mutex_unlock(&gatelock);
-
-			/* FS: process queue and IO */
-			if (monitor_thread == pthread_self()) {
-				if (sched) ast_sched_runq(sched);
-				if (io) ast_io_wait(io, 10);
-			}
-		}
-	}
-
-	/* prune deleted entries etc. */
-	prune_gateways();
-
-	if (ntohl(bindaddr.sin_addr.s_addr)) {
-		memcpy(&__ourip, &bindaddr.sin_addr, sizeof(__ourip));
-	} else {
-		if (resolve_first_addr(ourhost, &__ourip)) {
-			ast_log(LOG_WARNING, "Unable to get our IP address, MGCP disabled\n");
-			ast_config_destroy(cfg);
-			return 0;
-		}
-	}
-	if (!ntohs(bindaddr.sin_port))
-		bindaddr.sin_port = htons(DEFAULT_MGCP_CA_PORT);
-	bindaddr.sin_family = AF_INET;
-	ast_mutex_lock(&netlock);
-	if (mgcpsock > -1)
-		close(mgcpsock);
-
-	if (mgcpsock_read_id != NULL)
-		ast_io_remove(io, mgcpsock_read_id);
-	mgcpsock_read_id = NULL;
-
-	mgcpsock = socket(AF_INET, SOCK_DGRAM, 0);
-	if (mgcpsock < 0) {
-		ast_log(LOG_WARNING, "Unable to create MGCP socket: %s\n", strerror(errno));
-	} else {
-		if (bind(mgcpsock, (struct sockaddr *)&bindaddr, sizeof(bindaddr)) < 0) {
-			ast_log(LOG_WARNING, "Failed to bind to %s:%d: %s\n",
-				ast_inet_ntoa(bindaddr.sin_addr), ntohs(bindaddr.sin_port),
-					strerror(errno));
-			close(mgcpsock);
-			mgcpsock = -1;
-		} else {
-			ast_verb(2, "MGCP Listening on %s:%d\n",
-					ast_inet_ntoa(bindaddr.sin_addr), ntohs(bindaddr.sin_port));
-			ast_set_qos(mgcpsock, qos.tos, qos.cos, "MGCP");
-		}
-	}
-	ast_mutex_unlock(&netlock);
-	ast_config_destroy(cfg);
-
-	/* send audit only to the new endpoints */
-	for (g = gateways; g; g = g->next) {
-		for (e = g->endpoints; e && e->needaudit; e = e->next) {
-			e->needaudit = 0;
-			transmit_audit_endpoint(e);
-			ast_verb(3, "MGCP Auditing endpoint %s@%s for hookstate\n", e->name, g->name);
-		}
-	}
-
-	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 int load_module(void)
-{
-	if (!(global_capability = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	if (!(mgcp_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
-		ao2_ref(global_capability, -1);
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	ast_format_cap_append(global_capability, ast_format_ulaw, 0);
-	ast_format_cap_append(mgcp_tech.capabilities, ast_format_ulaw, 0);
-	ast_format_cap_append(mgcp_tech.capabilities, ast_format_alaw, 0);
-	if (!(sched = ast_sched_context_create())) {
-		ast_log(LOG_WARNING, "Unable to create schedule context\n");
-		ao2_ref(global_capability, -1);
-		ao2_ref(mgcp_tech.capabilities, -1);
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	if (!(io = io_context_create())) {
-		ast_log(LOG_WARNING, "Unable to create I/O context\n");
-		ast_sched_context_destroy(sched);
-		ao2_ref(global_capability, -1);
-		ao2_ref(mgcp_tech.capabilities, -1);
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	if (reload_config(0)) {
-		ao2_ref(global_capability, -1);
-		ao2_ref(mgcp_tech.capabilities, -1);
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	/* Make sure we can register our mgcp channel type */
-	if (ast_channel_register(&mgcp_tech)) {
-		ast_log(LOG_ERROR, "Unable to register channel class 'MGCP'\n");
-		io_context_destroy(io);
-		ast_sched_context_destroy(sched);
-		ao2_ref(global_capability, -1);
-		ao2_ref(mgcp_tech.capabilities, -1);
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	ast_rtp_glue_register(&mgcp_rtp_glue);
-	ast_cli_register_multiple(cli_mgcp, sizeof(cli_mgcp) / sizeof(struct ast_cli_entry));
-
-	/* And start the monitor for the first time */
-	restart_monitor();
-
-	return AST_MODULE_LOAD_SUCCESS;
-}
-
-static char *mgcp_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	static int deprecated = 0;
-
-	if (e) {
-		switch (cmd) {
-		case CLI_INIT:
-			e->command = "mgcp reload";
-			e->usage =
-				"Usage: mgcp reload\n"
-				"       'mgcp reload' is deprecated.  Please use 'reload chan_mgcp.so' instead.\n";
-			return NULL;
-		case CLI_GENERATE:
-			return NULL;
-		}
-	}
-
-	if (!deprecated && a && a->argc > 0) {
-		ast_log(LOG_WARNING, "'mgcp reload' is deprecated.  Please use 'reload chan_mgcp.so' instead.\n");
-		deprecated = 1;
-	}
-
-	ast_mutex_lock(&mgcp_reload_lock);
-	if (mgcp_reloading) {
-		ast_verbose("Previous mgcp reload not yet done\n");
-	} else {
-		mgcp_reloading = 1;
-	}
-	ast_mutex_unlock(&mgcp_reload_lock);
-	restart_monitor();
-	return CLI_SUCCESS;
-}
-
-static int reload(void)
-{
-	mgcp_reload(NULL, 0, NULL);
-	return 0;
-}
-
-static int unload_module(void)
-{
-	struct mgcp_endpoint *e;
-	struct mgcp_gateway *g;
-
-	/* Check to see if we're reloading */
-	if (ast_mutex_trylock(&mgcp_reload_lock)) {
-		ast_log(LOG_WARNING, "MGCP is currently reloading.  Unable to remove module.\n");
-		return -1;
-	} else {
-		mgcp_reloading = 1;
-		ast_mutex_unlock(&mgcp_reload_lock);
-	}
-
-	/* First, take us out of the channel loop */
-	ast_channel_unregister(&mgcp_tech);
-
-	/* Shut down the monitoring thread */
-	if (!ast_mutex_lock(&monlock)) {
-		if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP)) {
-			pthread_cancel(monitor_thread);
-			pthread_kill(monitor_thread, SIGURG);
-			pthread_join(monitor_thread, NULL);
-		}
-		monitor_thread = AST_PTHREADT_STOP;
-		ast_mutex_unlock(&monlock);
-	} else {
-		ast_log(LOG_WARNING, "Unable to lock the monitor\n");
-		/* We always want to leave this in a consistent state */
-		ast_channel_register(&mgcp_tech);
-		mgcp_reloading = 0;
-		mgcp_reload(NULL, 0, NULL);
-		return -1;
-	}
-
-	if (!ast_mutex_lock(&gatelock)) {
-		for (g = gateways; g; g = g->next) {
-			g->delme = 1;
-			for (e = g->endpoints; e; e = e->next) {
-				e->delme = 1;
-			}
-		}
-
-		prune_gateways();
-		ast_mutex_unlock(&gatelock);
-	} else {
-		ast_log(LOG_WARNING, "Unable to lock the gateways list.\n");
-		/* We always want to leave this in a consistent state */
-		ast_channel_register(&mgcp_tech);
-		/* Allow the monitor to restart */
-		monitor_thread = AST_PTHREADT_NULL;
-		mgcp_reloading = 0;
-		mgcp_reload(NULL, 0, NULL);
-		return -1;
-	}
-
-	if (mgcpsock > -1) {
-		close(mgcpsock);
-	}
-	ast_rtp_glue_unregister(&mgcp_rtp_glue);
-	ast_cli_unregister_multiple(cli_mgcp, sizeof(cli_mgcp) / sizeof(struct ast_cli_entry));
-	ast_sched_context_destroy(sched);
-
-	ao2_ref(global_capability, -1);
-	global_capability = NULL;
-	ao2_ref(mgcp_tech.capabilities, -1);
-	mgcp_tech.capabilities = NULL;
-
-	return 0;
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control Protocol (MGCP)",
-	.support_level = AST_MODULE_SUPPORT_DEPRECATED,
-	.load = load_module,
-	.unload = unload_module,
-	.reload = reload,
-	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
-	.optional_modules = "res_pktccops",
-);
diff --git a/configs/samples/cli_aliases.conf.sample b/configs/samples/cli_aliases.conf.sample
index adaed90..3baf105 100644
--- a/configs/samples/cli_aliases.conf.sample
+++ b/configs/samples/cli_aliases.conf.sample
@@ -175,7 +175,6 @@
 funcdevstate list=devstate list
 sip history=sip set history on
 skinny debug=skinny set debug on
-mgcp set debug=mgcp set debug on
 abort shutdown=core abort shutdown
 stop now=core stop now
 stop gracefully=core stop gracefully
diff --git a/configs/samples/extensions.ael.sample b/configs/samples/extensions.ael.sample
index b0e1517..ba8ce7e 100644
--- a/configs/samples/extensions.ael.sample
+++ b/configs/samples/extensions.ael.sample
@@ -423,7 +423,6 @@
 //       };
 
 // 6361 => Dial(IAX2/JaneDoe,,rm);                // ring without time limit
-// 6389 => Dial(MGCP/aaln/1 at 192.168.0.14);
 // 6394 => Dial(Local/6275/n);                    // this will dial ${MARK}
 
 // 6275 => &ael-stdexten(6275,${MARK});           // assuming ${MARK} is something like DAHDI/2
diff --git a/configs/samples/extensions.conf.sample b/configs/samples/extensions.conf.sample
index cd26dc3..e5fc5e1 100644
--- a/configs/samples/extensions.conf.sample
+++ b/configs/samples/extensions.conf.sample
@@ -223,7 +223,7 @@
 ;
 ; so that dialtone remains even after dialing a 9.  Please note that ignorepat
 ; only works with channels which receive dialtone from the PBX, such as DAHDI,
-; Phone, and VPB.  Other channels, such as IAX2, PJSIP, SIP and MGCP, which generate
+; Phone, and VPB.  Other channels, such as IAX2, PJSIP, and SIP, which generate
 ; generate their own dialtone and converse with the PBX only after a number is
 ; complete, are generally unaffected by ignorepat (unless DISA or another method
 ; is used to generate a dialtone after answering the channel).
@@ -694,7 +694,6 @@
 ;exten => 6245,s+1,Hangup			; s+1, same as n
 ;exten => 6245,dial+101,VoiceMail(6245,b)	; Voicemail (busy)
 ;exten => 6361,1,Dial(IAX2/JaneDoe,,rm)		; ring without time limit
-;exten => 6389,1,Dial(MGCP/aaln/1 at 192.168.0.14)
 ;exten => 6390,1,Dial(JINGLE/caller/callee) ; Dial via jingle using labels
 ;exten => 6391,1,Dial(JINGLE/asterisk at digium.com/mogorman at astjab.org) ;Dial via jingle using asterisk as the transport and calling mogorman.
 ;exten => 6394,1,Dial(Local/6275/n)		; this will dial ${MARK}
diff --git a/configs/samples/mgcp.conf.sample b/configs/samples/mgcp.conf.sample
deleted file mode 100644
index 107a30d..0000000
--- a/configs/samples/mgcp.conf.sample
+++ /dev/null
@@ -1,142 +0,0 @@
-;
-; MGCP Configuration for Asterisk
-;
-[general]
-;port = 2427
-;bindaddr = 0.0.0.0
-
-; See https://wiki.asterisk.org/wiki/display/AST/IP+Quality+of+Service for a description of these parameters.
-;tos=cs3		; Sets TOS for signaling packets.
-;tos_audio=ef		; Sets TOS for RTP audio packets.
-;cos=3			; Sets 802.1p priority for signaling packets.
-;cos_audio=5		; Sets 802.1p priority for RTP audio packets.
-
-; --------------------- DIGIT TIMEOUTS ----------------------------
-firstdigittimeout = 30000 ; default 16000 = 16s
-gendigittimeout = 10000   ; default  8000 = 8s
-matchdigittimeout = 5000  ; defaults 3000 = 3s
-
-; ----------------------------- JITTER BUFFER CONFIGURATION --------------------------
-; jbenable = yes              ; Enables the use of a jitterbuffer on the receiving side of a
-                              ; MGCP channel. Defaults to "no". An enabled jitterbuffer will
-                              ; be used only if the sending side can create and the receiving
-                              ; side can not accept jitter. The MGCP channel can accept jitter,
-                              ; thus an enabled jitterbuffer on the receive MGCP side will only
-                              ; be used if the sending side can create jitter and jbforce is
-                              ; also set to yes.
-
-; jbforce = no                ; Forces the use of a jitterbuffer on the receive side of a MGCP
-                              ; channel. Defaults to "no".
-
-; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
-
-; jbresyncthreshold = 1000    ; Jump in the frame timestamps over which the jitterbuffer is
-                              ; resynchronized. Useful to improve the quality of the voice, with
-                              ; big jumps in/broken timestamps, usually sent from exotic devices
-                              ; and programs. Defaults to 1000.
-
-; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a MGCP
-                              ; channel. Two implementations are currently available - "fixed"
-                              ; (with size always equals to jbmax-size) and "adaptive" (with
-                              ; variable size, actually the new jb of IAX2). Defaults to fixed.
-
-; jbtargetextra = 40          ; This option only affects the jb when 'jbimpl = adaptive' is set.
-                              ; The option represents the number of milliseconds by which the new
-                              ; jitter buffer will pad its size. the default is 40, so without
-                              ; modification, the new jitter buffer will set its size to the jitter
-                              ; value plus 40 milliseconds. increasing this value may help if your
-                              ; network normally has low jitter, but occasionally has spikes.
-
-; jblog = no                  ; Enables jitterbuffer frame logging. Defaults to "no".
-; ----------------------------------------------------------------------------------
-
-;[dlinkgw]
-;host = 192.168.0.64
-;context = default
-;directmedia = no
-;line => aaln/2
-;line => aaln/1
-
-;; The MGCP channel supports the following service codes:
-;; # - Transfer
-;; *67 - Calling Number Delivery Blocking
-;; *70 - Cancel Call Waiting
-;; *72 - Call Forwarding Activation
-;; *73 - Call Forwarding Deactivation
-;; *78 - Do Not Disturb Activation
-;; *79 - Do Not Disturb Deactivation
-;; *8 - Call pick-up
-;
-; known to work with Swissvoice IP10s
-;[192.168.1.20]
-;context=local
-;host=192.168.1.20
-;callerid = "John Doe" <123>
-;callgroup=0      ; in the range from 0 to 63
-;pickupgroup=0    ; in the range from 0 to 63
-;nat=no
-;threewaycalling=yes
-;transfer=yes     ; transfer requires threewaycalling=yes. Use FLASH to transfer
-;callwaiting=yes  ; this might be a cause of trouble for ip10s
-;cancallforward=yes
-;line => aaln/1
-;
-
-;[dph100]
-;
-; Supporting the DPH100M requires defining DLINK_BUGGY_FIRMWARE in
-; chan_mgcp.c in addition to enabling the slowsequence mode due to
-; bugs in the D-Link firmware
-;
-;context=local
-;host=dynamic
-;dtmfmode=none		; DTMF Mode can be 'none', 'rfc2833', or 'inband' or
-			; 'hybrid' which starts in none and moves to inband.  Default is none.
-;slowsequence=yes	; The DPH100M does not follow MGCP standards for sequencing
-;line => aaln/1
-
-; known to work with wave7optics FTTH LMGs
-;[192.168.1.20]
-;accountcode	= 1000		; record this in cdr as account identification for billing
-;amaflags	= billing	; record this in cdr as flagged for 'billing',
-				; 'documentation', or 'omit'
-;context	= local
-;host		= 192.168.1.20
-;wcardep	= aaln/*	; enables wildcard endpoint and sets it to 'aaln/*'
-				; another common format is '*'
-;callerid 	= "Duane Cox" <123>	; now lets setup line 1 using per endpoint configuration...
-;callwaiting	= no
-;callreturn	= yes
-;cancallforward = yes
-;directmedia	= no
-;transfer	= no
-;dtmfmode	= inband
-;setvar=one=1           ; Set channel variables associated with this incoming line
-;setvar=two=2
-;line => aaln/1			; now lets save this config to line1 aka aaln/1
-;clearvars=all          ; Reset list of variables back to none
-;callerid 	= "Duane Cox" <456>	; now lets setup line 2
-;callwaiting	= no
-;callreturn	= yes
-;cancallforward = yes
-;directmedia	= no
-;transfer	= no
-;dtmfmode	= inband
-;line => aaln/2			; now lets save this config to line2 aka aaln/2
-
-; PacketCable
-;[sbv5121e-mta.test.local]
-;host        = 10.0.1.3
-;callwaiting = 1
-;canreinvite = 1
-;dtmfmode    = rfc2833
-;amaflags    = BILLING
-;ncs         = yes ; Use NCS 1.0 signalling
-;pktcgatealloc = yes ; Allocate DQOS gate on CMTS
-;hangupongateremove = yes ; Hangup the channel if the CMTS close the gate
-;callerid    = 3622622225
-;accountcode = test-3622622225
-;line        = aaln/1
-;callerid    = 3622622226
-;accountcode = test-3622622226
-;line        = aaln/2
diff --git a/configs/samples/res_pktccops.conf.sample b/configs/samples/res_pktccops.conf.sample
deleted file mode 100644
index 769508d..0000000
--- a/configs/samples/res_pktccops.conf.sample
+++ /dev/null
@@ -1,32 +0,0 @@
-;; Sample res_pktccops.conf
-;
-;[general]
-;gateinfoperiod => 60 ; default 60s
-;gatetimeout = 150 ; default 150
-;t1 => 250 ; default 250s
-;t7 => 200 ; default 200s
-;t8 => 300 ; default 300s
-;keepalive => 60 ; default 60s
-;
-;[teszt]
-;host => 192.168.0.24
-;pool => 10.0.1.0 10.0.1.255
-;pool => 10.0.3.0 10.0.3.255
-;pool => 10.0.7.0 10.0.8.255
-;pool => 10.0.10.0 10.0.11.255
-;
-;[general]
-;gateinfoperiod => 60 ; default 60s
-;gatetimeout = 150 ; default 150
-;t1 => 250 ; default 250s
-;t7 => 200 ; default 200s
-;t8 => 300 ; default 300s
-;keepalive => 60 ; default 60s
-;
-;[test]
-;host => 192.168.0.24
-;pool => 10.0.1.0 10.0.1.255
-;pool => 10.0.3.0 10.0.3.255
-;pool => 10.0.7.0 10.0.8.255
-;pool => 10.0.10.0 10.0.11.255
-;
diff --git a/configure b/configure
index 168d791..0a18517 100755
--- a/configure
+++ b/configure
@@ -34950,101 +34950,6 @@
 fi
 
 
-# Used in res/res_pktccops
-
-    if test "x${PBX_MSG_NOSIGNAL}" != "x1"; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MSG_NOSIGNAL in sys/socket.h" >&5
-printf %s "checking for MSG_NOSIGNAL in sys/socket.h... " >&6; }
-	saved_cppflags="${CPPFLAGS}"
-	if test "x${MSG_NOSIGNAL_DIR}" != "x"; then
-	    MSG_NOSIGNAL_INCLUDE="-I${MSG_NOSIGNAL_DIR}/include"
-	fi
-	CPPFLAGS="${CPPFLAGS} ${MSG_NOSIGNAL_INCLUDE}"
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
- #include <sys/socket.h>
-int
-main (void)
-{
-#if defined(MSG_NOSIGNAL)
-				int foo = 0;
-			        #else
-			        int foo = bar;
-			        #endif
-				0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-		PBX_MSG_NOSIGNAL=1
-
-printf "%s\n" "#define HAVE_MSG_NOSIGNAL 1" >>confdefs.h
-
-
-
-else $as_nop
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-	CPPFLAGS="${saved_cppflags}"
-    fi
-
-
-
-    if test "x${PBX_SO_NOSIGPIPE}" != "x1"; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SO_NOSIGPIPE in sys/socket.h" >&5
-printf %s "checking for SO_NOSIGPIPE in sys/socket.h... " >&6; }
-	saved_cppflags="${CPPFLAGS}"
-	if test "x${SO_NOSIGPIPE_DIR}" != "x"; then
-	    SO_NOSIGPIPE_INCLUDE="-I${SO_NOSIGPIPE_DIR}/include"
-	fi
-	CPPFLAGS="${CPPFLAGS} ${SO_NOSIGPIPE_INCLUDE}"
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
- #include <sys/socket.h>
-int
-main (void)
-{
-#if defined(SO_NOSIGPIPE)
-				int foo = 0;
-			        #else
-			        int foo = bar;
-			        #endif
-				0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-		PBX_SO_NOSIGPIPE=1
-
-printf "%s\n" "#define HAVE_SO_NOSIGPIPE 1" >>confdefs.h
-
-
-
-else $as_nop
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-	CPPFLAGS="${saved_cppflags}"
-    fi
-
-
 
 
 		if test "x${PBX_SDL}" != "x1" -a "${USE_SDL}" != "no"; then
diff --git a/configure.ac b/configure.ac
index b7a206d..9b65e7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2792,9 +2792,6 @@
 AC_CHECK_HEADER([linux/compiler.h],
                 [AC_DEFINE_UNQUOTED([HAVE_LINUX_COMPILER_H], 1, [Define to 1 if your system has linux/compiler.h.])])
 
-# Used in res/res_pktccops
-AST_C_DEFINE_CHECK([MSG_NOSIGNAL], [MSG_NOSIGNAL], [sys/socket.h])
-AST_C_DEFINE_CHECK([SO_NOSIGPIPE], [SO_NOSIGPIPE], [sys/socket.h])
 
 AST_EXT_TOOL_CHECK([SDL], [sdl-config])
 AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
diff --git a/doc/UPGRADE-staging/chan_mgcp_removal.txt b/doc/UPGRADE-staging/chan_mgcp_removal.txt
new file mode 100644
index 0000000..11bb486
--- /dev/null
+++ b/doc/UPGRADE-staging/chan_mgcp_removal.txt
@@ -0,0 +1,7 @@
+Subject: chan_mgcp
+Master-Only: True
+
+This module was deprecated in Asterisk 19
+and is now being removed in accordance with
+the Asterisk Module Deprecation policy.
+
diff --git a/doc/asterisk.8 b/doc/asterisk.8
index 50ad8f6..74ef49f 100644
--- a/doc/asterisk.8
+++ b/doc/asterisk.8
@@ -45,7 +45,7 @@
 provides Private Branch eXchange (PBX), Interactive Voice Response (IVR),
 Automated Call Distribution (ACD), Voice over IP (VoIP) gatewaying,
 Conferencing, and a plethora of other telephony applications to a broad
-range of telephony devices including packet voice (SIP, IAX2, MGCP, Skinny,
+range of telephony devices including packet voice (SIP, IAX2, Skinny,
 H.323, Unistim) devices (both endpoints and proxies), as well as traditional TDM
 hardware including T1, E1, ISDN PRI, GR-303, RBS, Loopstart, Groundstart,
 ISDN BRI and many more.
diff --git a/doc/asterisk.sgml b/doc/asterisk.sgml
index 60450a0..1770b87 100644
--- a/doc/asterisk.sgml
+++ b/doc/asterisk.sgml
@@ -52,7 +52,7 @@
    provides Private Branch eXchange (PBX), Interactive Voice Response (IVR),
    Automated Call Distribution (ACD), Voice over IP (VoIP) gatewaying,
    Conferencing, and a plethora of other telephony applications to a broad
-   range of telephony devices including packet voice (SIP, IAX2, MGCP, Skinny,
+   range of telephony devices including packet voice (SIP, IAX2, Skinny,
    H.323, Unistim) devices (both endpoints and proxies), as well as traditional TDM
    hardware including T1, E1, ISDN PRI, GR-303, RBS, Loopstart, Groundstart,
    ISDN BRI and many more.
diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h
index d6daa85..53f4564 100644
--- a/include/asterisk/doxyref.h
+++ b/include/asterisk/doxyref.h
@@ -250,7 +250,7 @@
 /*!
  * \page Config_rtp RTP configuration
  * \arg Implemented in \ref rtp.c
- * Used in \ref chan_sip.c and \ref chan_mgcp.c (and various H.323 channels)
+ * Used in \ref chan_sip.c (and various H.323 channels)
  * \section rtpconf rtp.conf
  * \verbinclude rtp.conf.sample
  */
diff --git a/include/asterisk/pktccops.h b/include/asterisk/pktccops.h
deleted file mode 100644
index 14c71b4..0000000
--- a/include/asterisk/pktccops.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2009, Attila Domjan
- *
- * Attila Domjan <attila.domjan.hu at gmail.com>
- *
- * 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 PacketCable COPS
- *
- * \author Attila Domjan <attila.domjan.hu at gmail.com>
- */
-
-#ifndef _ASTERISK_PKTCCOPS_H
-#define _ASTERISK_PKTCCOPS_H
-
-#include "asterisk/optional_api.h"
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-enum {
-	GATE_SET,
-	GATE_INFO,
-	GATE_SET_HAVE_GATEID,
-	GATE_DEL
-};
-
-enum {
-	GATE_ALLOC_FAILED,
-	GATE_ALLOC_PROGRESS,
-	GATE_ALLOCATED,
-	GATE_CLOSED,
-	GATE_CLOSED_ERR,
-	GATE_OPEN,
-	GATE_DELETED,
-	GATE_TIMEOUT
-};
-
-struct cops_gate {
-	AST_LIST_ENTRY(cops_gate) list;
-	uint32_t gateid;
-	uint16_t trid;
-	time_t in_transaction;
-	uint32_t mta;
-	int state;
-	time_t allocated;
-	time_t checked;
-	time_t deltimer;
-	struct cops_cmts *cmts;
-	int (* got_dq_gi) (struct cops_gate *gate);
-	int (* gate_remove) (struct cops_gate *gate);
-	int (* gate_open) (struct cops_gate *gate);
-	void *tech_pvt;
-};
-
-
-AST_OPTIONAL_API(struct cops_gate *, ast_pktccops_gate_alloc,
-	(int cmd,  struct cops_gate *gate, uint32_t mta, uint32_t actcount,
-	 float bitrate, uint32_t psize, uint32_t ssip, uint16_t ssport,
-	 int (* const got_dq_gi) (struct cops_gate *gate),
-	 int (* const gate_remove) (struct cops_gate *gate)),
-	{ return NULL; });
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif /* _ASTERISK_PKTCCOPS_H */
diff --git a/include/asterisk/res_hep.h b/include/asterisk/res_hep.h
index 837baca..0d5b232 100644
--- a/include/asterisk/res_hep.h
+++ b/include/asterisk/res_hep.h
@@ -42,7 +42,6 @@
 	HEPV3_CAPTURE_TYPE_SDP    = 0x03,
 	HEPV3_CAPTURE_TYPE_RTP    = 0x04,
 	HEPV3_CAPTURE_TYPE_RTCP   = 0x05,
-	HEPV3_CAPTURE_TYPE_MGCP   = 0x06,
 	HEPV3_CAPTURE_TYPE_MEGACO = 0x07,
 	HEPV3_CAPTURE_TYPE_M2UA   = 0x08,
 	HEPV3_CAPTURE_TYPE_M3UA   = 0x09,
diff --git a/main/asterisk.dynamics b/main/asterisk.dynamics
index 1c4b1b1..a134e2a 100644
--- a/main/asterisk.dynamics
+++ b/main/asterisk.dynamics
@@ -2,7 +2,6 @@
 	*ast_adsi_*;
 	*ast_agi_*;
 	*ast_beep_*;
-	*ast_pktccops_*;
 	*ast_smdi_*;
 	*ast_monitor_*;
 	*ast_key_get;
diff --git a/menuselect/example_menuselect-tree b/menuselect/example_menuselect-tree
index 0b703e6..c107704 100644
--- a/menuselect/example_menuselect-tree
+++ b/menuselect/example_menuselect-tree
@@ -202,8 +202,6 @@
 		</member>
 		<member name="chan_local" displayname="Local Proxy Channel" remove_on_change="channels/chan_local.o channels/chan_local.so">
 		</member>
-		<member name="chan_mgcp" displayname="Media Gateway Control Protocol (MGCP)" remove_on_change="channels/chan_mgcp.o channels/chan_mgcp.so">
-		</member>
 		<member name="chan_sip" displayname="Session Initiation Protocol (SIP)" remove_on_change="channels/chan_sip.o channels/chan_sip.so">
 		</member>
 		<member name="chan_skinny" displayname="Skinny Client Control Protocol (Skinny)" remove_on_change="channels/chan_skinny.o channels/chan_skinny.so">
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
deleted file mode 100644
index 6b6ad33..0000000
--- a/res/res_pktccops.c
+++ /dev/null
@@ -1,1486 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2009, Attila Domjan
- *
- * Attila Domjan <attila.domjan.hu at gmail.com>
- *
- * 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 PacketCable COPS
- *
- * \author Attila Domjan <attila.domjan.hu at gmail.com>
- *
- * \note
- * This module is an add-on to chan_mgcp. It adds support for the
- * PacketCable MGCP variation called NCS. Res_pktccops implements COPS
- * (RFC 2748), a protocol used to manage dynamic bandwith allocation in
- * CMTS's (HFC gateways). When you use NCS, you need to talk COPS with
- * the CMTS to complete the calls.
- */
-
-/*** MODULEINFO
-        <defaultenabled>no</defaultenabled>
-	<support_level>deprecated</support_level>
-	<deprecated_in>19</deprecated_in>
-	<removed_in>21</removed_in>
- ***/
-
-#include "asterisk.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <signal.h>
-
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/config.h"
-#include "asterisk/options.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/cli.h"
-#include "asterisk/lock.h"
-#define AST_API_MODULE
-#include "asterisk/pktccops.h"
-
-#define DEFAULT_COPS_PORT "2126"
-
-#define COPS_HEADER_SIZE 8
-#define COPS_OBJECT_HEADER_SIZE 4
-#define GATE_SET_OBJ_SIZE 144
-#define GATEID_OBJ_SIZE 8
-#define GATE_INFO_OBJ_SIZE 24
-
-#define PKTCCOPS_SCOMMAND_GATE_ALLOC 1
-#define PKTCCOPS_SCOMMAND_GATE_ALLOC_ACK 2
-#define PKTCCOPS_SCOMMAND_GATE_ALLOC_ERR 3
-#define PKTCCOPS_SCOMMAND_GATE_SET 4
-#define PKTCCOPS_SCOMMAND_GATE_SET_ACK 5
-#define PKTCCOPS_SCOMMAND_GATE_SET_ERR 6
-#define PKTCCOPS_SCOMMAND_GATE_INFO 7
-#define PKTCCOPS_SCOMMAND_GATE_INFO_ACK 8
-#define PKTCCOPS_SCOMMAND_GATE_INFO_ERR 9
-#define PKTCCOPS_SCOMMAND_GATE_DELETE 10
-#define PKTCCOPS_SCOMMAND_GATE_DELETE_ACK 11
-#define PKTCCOPS_SCOMMAND_GATE_DELETE_ERR 12
-#define PKTCCOPS_SCOMMAND_GATE_OPEN 13
-#define PKTCCOPS_SCOMMAND_GATE_CLOSE 14
-
-AST_MUTEX_DEFINE_STATIC(pktccops_lock);
-static pthread_t pktccops_thread = AST_PTHREADT_NULL;
-static uint16_t cops_trid = 0;
-
-struct pktcobj {
-	uint16_t length;
-	unsigned char cnum;
-	unsigned char ctype;
-	char *contents;
-	struct pktcobj *next;
-};
-
-struct copsmsg {
-	unsigned char verflag;
-	unsigned char opcode;
-	uint16_t clienttype;
-	uint32_t length;
-	struct pktcobj *object;
-	char *msg; /* != NULL if not packet cable message received */
-};
-
-struct gatespec {
-	int direction; /* 0-DS, 1-US */
-	int protocolid;
-	int flags; /* 0x00 */
-	int sessionclass; /* normal voip: 0x01, high priority voip: 0x02, unspecified: 0x00 */
-	uint32_t srcip;
-	uint32_t dstip;
-	uint16_t srcp;
-	uint16_t dstp;
-	int diffserv;
-	uint16_t t1;
-	uint16_t t7;
-	uint16_t t8;
-	uint32_t r; /* Token Bucket Rate */
-	uint32_t b; /* token Bucket Size */
-	uint32_t p; /* Peak Data Rate */
-	uint32_t m; /* Minimum Policed Size*/
-	uint32_t mm; /* Maximum Policed Size */
-	uint32_t rate;
-	uint32_t s; /* Allowable Jitter*/
-};
-
-
-struct cops_cmts {
-	AST_LIST_ENTRY(cops_cmts) list;
-	char name[80];
-	char host[80];
-	char port[80];
-	uint16_t t1;
-	uint16_t t7;
-	uint16_t t8;
-	uint32_t keepalive;
-
-	uint32_t handle;
-	int state;
-	time_t contime;
-	time_t katimer;
-	int sfd;
-	int need_delete;
-};
-
-struct cops_ippool {
-	AST_LIST_ENTRY(cops_ippool) list;
-	uint32_t start;
-	uint32_t stop;
-	struct cops_cmts *cmts;
-};
-
-static uint16_t t1 = 250;
-static uint16_t t7 = 200;
-static uint16_t t8 = 300;
-static uint32_t keepalive = 60;
-static int pktcreload = 0;
-static int gateinfoperiod = 60;
-static int gatetimeout = 150;
-
-AST_LIST_HEAD_STATIC(cmts_list, cops_cmts);
-AST_LIST_HEAD_STATIC(ippool_list, cops_ippool);
-AST_LIST_HEAD_STATIC(gate_list, cops_gate);
-
-static int pktccops_add_ippool(struct cops_ippool *ippool);
-static struct cops_gate *cops_gate_cmd(int cmd, struct cops_cmts *cmts, uint16_t trid, uint32_t mta, uint32_t actcount, float bitrate, uint32_t psize, uint32_t ssip, uint16_t ssport, struct cops_gate *gate);
-static void pktccops_unregister_ippools(void);
-static int load_pktccops_config(void);
-
-static uint32_t ftoieeef(float n)
-{
-	uint32_t res;
-	memcpy(&res, &n, 4);
-	return htonl(res);
-}
-
-static uint16_t cops_constructgatespec(struct gatespec *gs, char *res)
-{
-	if (res == NULL) {
-		return 0;
-	}
-
-	*res = (char) gs->direction;
-	*(res + 1) = (char) gs->protocolid;
-	*(res + 2) = (char) gs->flags;
-	*(res + 3) = (char) gs->sessionclass;
-
-	*((uint32_t *) (res + 4)) = gs->srcip;
-	*((uint32_t *) (res + 8)) = gs->dstip;
-
-	*((uint16_t *) (res + 12)) = gs->srcp;
-	*((uint16_t *) (res + 14)) = gs->dstp;
-
-	*(res + 16) = (char) gs->diffserv;
-	*(res + 17) = 0; /* reserved */
-	*(res + 18) = 0; /* reserved */
-	*(res + 19) = 0; /* reserved */
-
-	*((uint16_t *) (res + 20)) = gs->t1;
-	*(res + 22) = 0; /* reserved */
-	*(res + 23) = 0; /* reserved */
-
-	*((uint16_t *) (res + 24)) = gs->t7;
-	*((uint16_t *) (res + 26)) = gs->t8;
-
-	*((uint32_t *) (res + 28)) = gs->r;
-	*((uint32_t *) (res + 32)) = gs->b;
-	*((uint32_t *) (res + 36)) = gs->p;
-	*((uint32_t *) (res + 40)) = gs->m;
-	*((uint32_t *) (res + 44)) = gs->mm;
-	*((uint32_t *) (res + 48)) = gs->rate;
-	*((uint32_t *) (res + 52)) = gs->s;
-	return 56; /* length */
-};
-
-static uint16_t cops_construct_gate (int cmd, char *p,  uint16_t trid,
-		uint32_t mtahost, uint32_t actcount, float rate, uint32_t psizegateid,
-		uint32_t ssip, uint16_t ssport, uint32_t gateid, struct cops_cmts *cmts)
-{
-	struct gatespec gs;
-	int offset = 0;
-
-	ast_debug(3, "CMD: %d\n", cmd);
-
-	/* Transaction Identifier 8 octets */
-	*(p + offset++) = 0;
-	*(p + offset++) = 8; /* length */
-	*(p + offset++) = 1; /* snum */
-	*(p + offset++) = 1; /* stype */
-	*((uint16_t *) (p + offset)) = htons(trid);
-	offset += 2;
-	*(p + offset++) = 0;
-	*(p + offset++) = (cmd == GATE_DEL) ? PKTCCOPS_SCOMMAND_GATE_DELETE : (cmd != GATE_INFO) ? PKTCCOPS_SCOMMAND_GATE_SET : PKTCCOPS_SCOMMAND_GATE_INFO; /* 4: GATE-SET, 7: GATE-INFO */
-
-	/*Subscriper Identifier 8 octets */
-	*(p + offset++) = 0;
-	*(p + offset++) = 8; /* length */
-	*(p + offset++) = 2; /* snum */
-	*(p + offset++) = 1; /* stype */
-	*((uint32_t *) (p + offset)) = htonl(mtahost);
-	offset += 4;
-
-	if (cmd == GATE_INFO || cmd == GATE_SET_HAVE_GATEID || cmd == GATE_DEL) {
-		/* Gate ID 8 Octets */
-		*(p + offset++) = 0;
-		*(p + offset++) = 8; /* length */
-		*(p + offset++) = 3; /* snum */
-		*(p + offset++) = 1; /* stype */
-		*((uint32_t *) (p + offset)) = htonl(gateid);
-		offset += 4;
-		if (cmd == GATE_INFO || cmd == GATE_DEL) {
-			return offset;
-		}
-
-	}
-
-	/* Activity Count 8 octets */
-	*(p + offset++) = 0;
-	*(p + offset++) = 8; /* length */
-	*(p + offset++) = 4; /* snum */
-	*(p + offset++) = 1; /* stype */
-	*((uint32_t *) (p + offset)) = htonl(actcount);
-	offset += 4;
-
-
-	/* Gate Spec 2*60 Octets */
-	gs.direction = 0; /* DS */
-	gs.protocolid = 17; /* UDP */
-	gs.flags = 0;
-	gs.sessionclass = 1;
-	gs.srcip = htonl(ssip);
-	gs.dstip = htonl(mtahost);
-	gs.srcp = htons(ssport);
-	gs.dstp = 0;
-/*	gs.diffserv = 0xa0;*/
-	gs.diffserv = 0;
-	gs.t1 = htons(cmts->t1);
-	gs.t7 = htons(cmts->t7);
-	gs.t8 = htons(cmts->t8);
-	gs.r = ftoieeef(rate);
-	gs.b = ftoieeef(psizegateid);
-	gs.p = ftoieeef(rate);
-	gs.m = htonl((uint32_t) psizegateid);
-	gs.mm = htonl((uint32_t) psizegateid);
-	gs.rate = ftoieeef(rate);
-	gs.s = htonl(800);
-
-
-	*(p + offset) = 0;
-	offset++;
-	*(p + offset) = 60; /* length */
-	offset++;
-	*(p + offset) = 5; /* snum */
-	offset++;
-	*(p + offset) = 1; /* stype */
-	offset++;
-	offset += cops_constructgatespec(&gs, p + offset);
-
-
-	gs.direction = 1; /* US */
-	gs.srcip = htonl(mtahost);
-	gs.dstip = htonl(ssip);
-	gs.srcp = 0;
-	gs.dstp = htons(ssport);
-	*(p + offset) = 0;
-	offset++;
-	*(p + offset) = 60; /* length */
-	offset++;
-	*(p + offset) = 5; /* snum */
-	offset++;
-	*(p + offset) = 1; /* stype */
-	offset++;
-	offset += cops_constructgatespec(&gs, p + offset);
-
-	return(offset);
-}
-
-static int cops_getmsg (int sfd, struct copsmsg *recmsg)
-{
-	int len, lent;
-	char buf[COPS_HEADER_SIZE];
-	struct pktcobj *pobject = NULL;
-	uint16_t *ubuf = (uint16_t *) buf;
-	recmsg->msg = NULL;
-	recmsg->object = NULL;
-	len = recv(sfd, buf, COPS_HEADER_SIZE, MSG_DONTWAIT);
-	if (len < COPS_HEADER_SIZE) {
-		return len;
-	}
-	recmsg->verflag = *buf;
-	recmsg->opcode = *(buf + 1);
-	recmsg->clienttype = ntohs(*((uint16_t *) (buf + 2)));
-	recmsg->length = ntohl(*((uint32_t *) (buf + 4)));
-	/* Eg KA msg*/
-	if (recmsg->clienttype != 0x8008 ) {
-		if (!(recmsg->msg = ast_malloc(recmsg->length - COPS_HEADER_SIZE))) {
-			return -1;
-		}
-		lent = recv(sfd, recmsg->msg, recmsg->length - COPS_HEADER_SIZE, MSG_DONTWAIT);
-		if (lent < recmsg->length - COPS_HEADER_SIZE) {
-			return lent;
-		}
-		len += len;
-	} else {
-		/* PacketCable Objects */
-		while (len < recmsg->length) {
-			if (len == COPS_HEADER_SIZE) {
-				/* 1st round */
-				if (!(recmsg->object = ast_malloc(sizeof(struct pktcobj)))) {
-					return -1;
-				}
-				pobject = recmsg->object;
-			} else {
-		 		if (!(pobject->next = ast_malloc(sizeof(struct pktcobj)))) {
-					return -1;
-				}
-				pobject = pobject->next;
-			}
-			pobject->next = NULL;
-			lent = recv(sfd, buf, COPS_OBJECT_HEADER_SIZE, MSG_DONTWAIT);
-			if (lent < COPS_OBJECT_HEADER_SIZE) {
-				ast_debug(3, "Too short object header len: %i\n", lent);
-				return lent;
-			}
-			len += lent;
-			pobject->length = ntohs(*ubuf);
-			pobject->cnum = *(buf + 2);
-			pobject->ctype = *(buf + 3);
-			if (!(pobject->contents = ast_malloc(pobject->length - COPS_OBJECT_HEADER_SIZE))) {
-				return -1;
-			}
-			lent = recv(sfd, pobject->contents, pobject->length - COPS_OBJECT_HEADER_SIZE, MSG_DONTWAIT);
-			if (lent < pobject->length - COPS_OBJECT_HEADER_SIZE) {
-				ast_debug(3, "Too short object content len: %i\n", lent);
-				return lent;
-			}
-			len += lent;
-		}
-	}
-	return len;
-}
-
-static int cops_sendmsg (int sfd, struct copsmsg * sendmsg)
-{
-	char *buf;
-	int bufpos;
-	struct pktcobj *pobject;
-
-	if (sfd < 0) {
-		return -1;
-	}
-
-	ast_debug(3, "COPS: sending opcode: %i len: %u\n", sendmsg->opcode, sendmsg->length);
-	if (sendmsg->length < COPS_HEADER_SIZE) {
-		ast_log(LOG_WARNING, "COPS: invalid msg size!!!\n");
-		return -1;
-	}
-	if (!(buf = ast_malloc((size_t) sendmsg->length))) {
-		return -1;
-	}
-	*buf = sendmsg->verflag ;
-	*(buf + 1) = sendmsg->opcode;
-	*((uint16_t *)(buf + 2)) = htons(sendmsg->clienttype);
-	*((uint32_t *)(buf + 4)) = htonl(sendmsg->length);
-
-	if (sendmsg->msg != NULL) {
-		memcpy(buf + COPS_HEADER_SIZE, sendmsg->msg, sendmsg->length - COPS_HEADER_SIZE);
-	} else if (sendmsg->object != NULL) {
-		bufpos = 8;
-		pobject = sendmsg->object;
-		while(pobject != NULL) {
-			ast_debug(3, "COPS: Sending Object : cnum: %i ctype %i len: %i\n", pobject->cnum, pobject->ctype, pobject->length);
-			if (sendmsg->length < bufpos + pobject->length) {
-				ast_log(LOG_WARNING, "COPS: Invalid msg size len: %u objectlen: %i\n", sendmsg->length, pobject->length);
-				ast_free(buf);
-				return -1;
-			}
-			*(uint16_t *) (buf + bufpos) = htons(pobject->length);
-			*(buf + bufpos + 2) = pobject->cnum;
-			*(buf + bufpos + 3) = pobject->ctype;
-			if (sendmsg->length < pobject->length + bufpos) {
-				ast_log(LOG_WARNING, "COPS: Error sum of object len more the msg len %u < %i\n", sendmsg->length, pobject->length + bufpos);
-				ast_free(buf);
-				return -1;
-			}
-			memcpy((buf + bufpos + 4), pobject->contents, pobject->length - 4);
-			bufpos += pobject->length;
-			pobject = pobject->next;
-		}
-	}
-
-	errno = 0;
-#ifdef HAVE_MSG_NOSIGNAL
-#define	SENDFLAGS	MSG_NOSIGNAL | MSG_DONTWAIT
-#else
-#define	SENDFLAGS	MSG_DONTWAIT
-#endif
-	if (send(sfd, buf, sendmsg->length, SENDFLAGS) == -1) {
-		ast_log(LOG_WARNING, "COPS: Send failed errno=%i\n", errno);
-		ast_free(buf);
-		return -2;
-	}
-#undef SENDFLAGS
-	ast_free(buf);
-	return 0;
-}
-
-static void cops_freemsg(struct copsmsg *p)
-{
-	struct pktcobj *pnext;
-	ast_free(p->msg);
-	p->msg = NULL;
-	while (p->object != NULL) {
-			pnext = p->object->next;
-			ast_free(p->object->contents);
-			p->object->contents = NULL;
-			ast_free(p->object);
-			p->object = pnext;
-	}
-	p->object = NULL;
-}
-
-struct cops_gate * AST_OPTIONAL_API_NAME(ast_pktccops_gate_alloc)(int cmd,
-		struct cops_gate *gate, uint32_t mta, uint32_t actcount, float bitrate,
-		uint32_t psize, uint32_t ssip, uint16_t ssport,
-		int (* const got_dq_gi) (struct cops_gate *gate),
-		int (* const gate_remove) (struct cops_gate *gate))
-{
-	while (pktcreload) {
-		sched_yield();
-	}
-
-	if (cmd == GATE_SET_HAVE_GATEID && gate) {
-		ast_debug(3, "------- gate modify gateid 0x%x ssip: 0x%x\n", gate->gateid, ssip);
-		/* TODO implement it */
-		ast_log(LOG_WARNING, "Modify GateID not implemented\n");
-	}
-
-	if ((gate = cops_gate_cmd(cmd, NULL, cops_trid++, mta, actcount, bitrate, psize, ssip, ssport, gate))) {
-		ast_debug(3, "COPS: Allocating gate for mta: 0x%x\n", mta);
-		gate->got_dq_gi = got_dq_gi;
-		gate->gate_remove = gate_remove;
-		return(gate);
-	} else {
-		ast_debug(3, "COPS: Couldn't allocate gate for mta: 0x%x\n", mta);
-		return NULL;
-	}
-}
-
-static struct cops_gate *cops_gate_cmd(int cmd, struct cops_cmts *cmts,
-		uint16_t trid, uint32_t mta, uint32_t actcount, float bitrate,
-		uint32_t psize, uint32_t ssip, uint16_t ssport, struct cops_gate *gate)
-{
-	struct copsmsg *gateset;
-	struct cops_gate *new;
-	struct cops_ippool *ippool;
-
-	if (cmd == GATE_DEL) {
-		if (gate == NULL) {
-			return NULL;
-		} else {
-			cmts = gate->cmts;
-		}
-	}
-
-	if (!cmts) {
-		AST_LIST_LOCK(&ippool_list);
-		AST_LIST_TRAVERSE(&ippool_list, ippool, list) {
-			if (mta >= ippool->start && mta <= ippool->stop) {
-				cmts = ippool->cmts;
-				break;
-			}
-		}
-		AST_LIST_UNLOCK(&ippool_list);
-		if (!cmts) {
-			ast_log(LOG_WARNING, "COPS: couldn't find cmts for mta: 0x%x\n", mta);
-			return NULL;
-		}
-		if (cmts->sfd < 0) {
-			ast_log(LOG_WARNING, "CMTS: %s not connected\n", cmts->name);
-			return NULL;
-		}
-	}
-
-	if (cmd == GATE_SET) {
-		new = ast_calloc(1, sizeof(*new));
-		new->gateid = 0;
-		new->trid = trid;
-		new->mta = mta;
-		new->state = GATE_ALLOC_PROGRESS;
-		new->checked = time(NULL);
-		new->allocated = time(NULL);
-		new->cmts = cmts;
-		new->got_dq_gi = NULL;
-		new->gate_remove = NULL;
-		new->gate_open = NULL;
-		new->tech_pvt = NULL;
-		new->deltimer = 0;
-		AST_LIST_LOCK(&gate_list);
-		AST_LIST_INSERT_HEAD(&gate_list, new, list);
-		AST_LIST_UNLOCK(&gate_list);
-		gate = new;
-	} else {
-		if (gate) {
-			gate->trid = trid;
-		}
-	}
-
-	gate->in_transaction = time(NULL);
-
-	if (!(gateset = ast_malloc(sizeof(struct copsmsg)))) {
-		ast_free(gateset);
-		return NULL;
-	}
-	gateset->msg = NULL;
-	gateset->verflag = 0x10;
-	gateset->opcode = 2; /* Decision */
-	gateset->clienttype = 0x8008; /* =PacketCable */
-
-	/* Handle object */
-	gateset->object = ast_malloc(sizeof(struct pktcobj));
-	if (!gateset->object) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	gateset->object->length = COPS_OBJECT_HEADER_SIZE + 4;
-	gateset->object->cnum = 1; /* Handle */
-	gateset->object->ctype = 1; /* client */
-	if (!(gateset->object->contents = ast_malloc(sizeof(uint32_t)))) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	*((uint32_t *) gateset->object->contents) = htonl(cmts->handle);
-
-	/* Context Object */
-	if (!(gateset->object->next = ast_malloc(sizeof(struct pktcobj)))) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	gateset->object->next->length = COPS_OBJECT_HEADER_SIZE + 4;
-	gateset->object->next->cnum = 2; /* Context */
-	gateset->object->next->ctype = 1; /* Context */
-	if (!(gateset->object->next->contents = ast_malloc(sizeof(uint32_t)))) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	*((uint32_t *) gateset->object->next->contents) = htonl(0x00080000); /* R-Type = 8 configuration request, M-Type = 0 */
-
-	/* Decision Object: Flags */
-	if (!(gateset->object->next->next = ast_malloc(sizeof(struct pktcobj)))) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	gateset->object->next->next->length = COPS_OBJECT_HEADER_SIZE + 4;
-	gateset->object->next->next->cnum = 6; /* Decision */
-	gateset->object->next->next->ctype = 1; /* Flags */
-	if (!(gateset->object->next->next->contents = ast_malloc(sizeof(uint32_t)))) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	*((uint32_t *) gateset->object->next->next->contents) = htonl(0x00010001); /* Install, Trigger Error */
-
-	/* Decision Object: Data */
-	if (!(gateset->object->next->next->next = ast_malloc(sizeof(struct pktcobj)))) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	gateset->object->next->next->next->length = COPS_OBJECT_HEADER_SIZE + ((cmd != GATE_INFO && cmd != GATE_DEL) ? GATE_SET_OBJ_SIZE : GATE_INFO_OBJ_SIZE) + ((cmd == GATE_SET_HAVE_GATEID) ? GATEID_OBJ_SIZE : 0);
-	gateset->object->next->next->next->cnum = 6; /* Decision */
-	gateset->object->next->next->next->ctype = 4; /* Decision Data */
-	gateset->object->next->next->next->contents = ast_malloc(((cmd != GATE_INFO && cmd != GATE_DEL) ? GATE_SET_OBJ_SIZE : GATE_INFO_OBJ_SIZE) + ((cmd == GATE_SET_HAVE_GATEID) ? GATEID_OBJ_SIZE : 0));
-	if (!gateset->object->next->next->next->contents) {
-		cops_freemsg(gateset);
-		ast_free(gateset);
-		return NULL;
-	}
-	gateset->object->next->next->next->next = NULL;
-
-	gateset->length = COPS_HEADER_SIZE + gateset->object->length + gateset->object->next->length + gateset->object->next->next->length + gateset->object->next->next->next->length;
-
-	if ((cmd == GATE_INFO || cmd == GATE_SET_HAVE_GATEID || cmd == GATE_DEL) && gate) {
-		ast_debug(1, "Construct gate with gateid: 0x%x\n", gate->gateid);
-		cops_construct_gate(cmd, gateset->object->next->next->next->contents, trid, mta, actcount, bitrate, psize, ssip, ssport, gate->gateid, cmts);
-	} else {
-		ast_debug(1, "Construct new gate\n");
-		cops_construct_gate(cmd, gateset->object->next->next->next->contents, trid, mta, actcount, bitrate, psize, ssip, ssport, 0, cmts);
-	}
-	ast_debug(3, "send cmd\n");
-	cops_sendmsg(cmts->sfd, gateset);
-	cops_freemsg(gateset);
-	ast_free(gateset);
-	return gate;
-}
-
-static int cops_connect(char *host, char *port)
-{
-	int s, sfd = -1;
-	struct addrinfo hints;
-	struct addrinfo *rp;
-	struct addrinfo *result;
-#ifdef HAVE_SO_NOSIGPIPE
-	int trueval = 1;
-#endif
-
-	memset(&hints, 0, sizeof(struct addrinfo));
-
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_flags = 0;
-	hints.ai_protocol = 0;
-
-	s = getaddrinfo(host, port, &hints, &result);
-	if (s != 0) {
-		ast_log(LOG_WARNING, "COPS: getaddrinfo: %s\n", gai_strerror(s));
-		return -1;
-	}
-
-	for (rp = result; rp != NULL; rp = rp->ai_next) {
-		sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-		if (sfd == -1) {
-			ast_log(LOG_WARNING, "Failed socket\n");
-		}
-		ast_fd_set_flags(sfd, O_NONBLOCK);
-#ifdef HAVE_SO_NOSIGPIPE
-		setsockopt(sfd, SOL_SOCKET, SO_NOSIGPIPE, &trueval, sizeof(trueval));
-#endif
-		connect(sfd, rp->ai_addr, rp->ai_addrlen);
-		if (sfd == -1) {
-			ast_log(LOG_WARNING, "Failed connect\n");
-		}
-	}
-	freeaddrinfo(result);
-
-	ast_debug(3, "Connecting to cmts:  %s:%s\n", host, port);
-	return(sfd);
-}
-
-#define PKTCCOPS_DESTROY_CURRENT_GATE   \
-		AST_LIST_REMOVE_CURRENT(list);  \
-		if (gate->gate_remove) {        \
-			gate->gate_remove(gate);    \
-		}                               \
-		ast_free(gate);
-
-static void *do_pktccops(void *data)
-{
-	int res, nfds, len;
-	struct copsmsg *recmsg, *sendmsg;
-	struct copsmsg recmsgb, sendmsgb;
-	struct pollfd *pfds = NULL, *tmp;
-	struct pktcobj *pobject;
-	struct cops_cmts *cmts;
-	struct cops_gate *gate;
-	char *sobjp;
-	uint16_t snst, sobjlen, scommand, recvtrid, actcount, reason, subreason;
-	uint32_t gateid, subscrid, pktcerror;
-	time_t last_exec = 0;
-
-	recmsg = &recmsgb;
-	sendmsg = &sendmsgb;
-
-	ast_debug(3, "COPS: thread started\n");
-
-	for (;;) {
-		ast_free(pfds);
-		pfds = NULL;
-		nfds = 0;
-		AST_LIST_LOCK(&cmts_list);
-		AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
-			if (last_exec != time(NULL)) {
-				if (cmts->state == 2 && cmts->katimer + cmts->keepalive < time(NULL)) {
-					ast_log(LOG_WARNING, "KA timer (%us) expired cmts: %s\n",  cmts->keepalive, cmts->name);
-					cmts->state = 0;
-					cmts->katimer = -1;
-					close(cmts->sfd);
-					cmts->sfd = -1;
-				}
-			}
-			if (cmts->sfd > 0) {
-				if (!(tmp = ast_realloc(pfds, (nfds + 1) * sizeof(*pfds)))) {
-					continue;
-				}
-				pfds = tmp;
-				pfds[nfds].fd = cmts->sfd;
-				pfds[nfds].events = POLLIN;
-				pfds[nfds].revents = 0;
-				nfds++;
-			} else {
-				cmts->sfd = cops_connect(cmts->host, cmts->port);
-				if (cmts->sfd > 0) {
-					cmts->state = 1;
-					if (cmts->sfd > 0) {
-						if (!(tmp = ast_realloc(pfds, (nfds + 1) * sizeof(*pfds)))) {
-							continue;
-						}
-						pfds = tmp;
-						pfds[nfds].fd = cmts->sfd;
-						pfds[nfds].events = POLLIN;
-						pfds[nfds].revents = 0;
-						nfds++;
-					}
-				}
-			}
-		}
-		AST_LIST_UNLOCK(&cmts_list);
-
-		if (last_exec != time(NULL)) {
-			last_exec = time(NULL);
-			AST_LIST_LOCK(&gate_list);
-			AST_LIST_TRAVERSE_SAFE_BEGIN(&gate_list, gate, list) {
-				if (gate) {
-					if (gate->deltimer && gate->deltimer < time(NULL)) {
-						gate->deltimer = time(NULL) + 5;
-						gate->trid = cops_trid++;
-						cops_gate_cmd(GATE_DEL, gate->cmts, gate->trid, 0, 0, 0, 0, 0, 0, gate);
-						ast_debug(3, "COPS: requested Gate-Del: CMTS: %s gateid: 0x%x\n", (gate->cmts) ? gate->cmts->name : "null", gate->gateid);
-					}
-					if (time(NULL) - gate->checked > gatetimeout) {
-						ast_debug(3, "COPS: remove from list GATE, CMTS: %s gateid: 0x%x\n", (gate->cmts) ? gate->cmts->name : "null", gate->gateid);
-						gate->state = GATE_TIMEOUT;
-						PKTCCOPS_DESTROY_CURRENT_GATE;
-					} else if (time(NULL) - gate->checked > gateinfoperiod && (gate->state == GATE_ALLOCATED || gate->state == GATE_OPEN)) {
-						if (gate->cmts && (!gate->in_transaction || ( gate->in_transaction + 5 ) < time(NULL))) {
-							gate->trid = cops_trid++;
-							ast_debug(3, "COPS: Gate-Info send to CMTS: %s gateid: 0x%x\n", gate->cmts->name, gate->gateid);
-							cops_gate_cmd(GATE_INFO, gate->cmts, gate->trid, gate->mta, 0, 0, 0, 0, 0, gate);
-						}
-					}
-				}
-			}
-			AST_LIST_TRAVERSE_SAFE_END;
-			AST_LIST_UNLOCK(&gate_list);
-		}
-
-		if (pktcreload == 2) {
-			pktcreload = 0;
-		}
-		if ((res = ast_poll(pfds, nfds, 1000))) {
-			AST_LIST_LOCK(&cmts_list);
-			AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
-				int idx;
-				if ((idx = ast_poll_fd_index(pfds, nfds, cmts->sfd)) > -1 && (pfds[idx].revents & POLLIN)) {
-					len = cops_getmsg(cmts->sfd, recmsg);
-					if (len > 0) {
-						ast_debug(3, "COPS: got from %s:\n Header: versflag=0x%02hhx opcode=%i clienttype=0x%04hx msglength=%u\n",
-							cmts->name, recmsg->verflag,
-							recmsg->opcode, recmsg->clienttype, recmsg->length);
-						if (recmsg->object != NULL) {
-							pobject = recmsg->object;
-							while (pobject != NULL) {
-								ast_debug(3, " OBJECT: length=%i cnum=%i ctype=%i\n", pobject->length, pobject->cnum, pobject->ctype);
-								if (recmsg->opcode == 1 && pobject->cnum == 1 && pobject->ctype == 1 ) {
-									cmts->handle = ntohl(*((uint32_t *) pobject->contents));
-									ast_debug(3, "    REQ client handle: %u\n", cmts->handle);
-									cmts->state = 2;
-									cmts->katimer = time(NULL);
-								} else if (pobject->cnum == 9 && pobject->ctype == 1) {
-									sobjp = pobject->contents;
-									subscrid = 0;
-									recvtrid = 0;
-									scommand = 0;
-									pktcerror = 0;
-									actcount = 0;
-									gateid = 0;
-									reason = 0;
-									subreason = 0;
-									while (sobjp < (pobject->contents + pobject->length - 4)) {
-										sobjlen = ntohs(*((uint16_t *) sobjp));
-										snst = ntohs(*((uint16_t *) (sobjp + 2)));
-										ast_debug(3, "   S-Num S-type: 0x%.4x len: %i\n", (unsigned)snst, sobjlen);
-										if (snst == 0x0101 ) {
-											recvtrid = ntohs(*((uint16_t *) (sobjp + 4)));
-											scommand = ntohs(*((uint16_t *) (sobjp + 6)));
-											ast_debug(3, "     Transaction Identifier command: %i trid %i\n", scommand, recvtrid);
-										} else if (snst == 0x0201) {
-											subscrid = ntohl(*((uint32_t *) (sobjp + 4)));
-											ast_debug(3, "     Subscriber ID: 0x%.8x\n", subscrid);
-										} else if (snst == 0x0301) {
-											gateid = ntohl(*((uint32_t *) (sobjp + 4)));
-											ast_debug(3, "      Gate ID: 0x%x 0x%.8x\n", gateid, gateid);
-										} else if (snst == 0x0401) {
-											actcount = ntohs(*((uint16_t *) (sobjp + 6)));
-											ast_debug(3, "      Activity Count: %i\n", actcount);
-										} else if (snst == 0x0901) {
-											pktcerror = ntohl(*((uint32_t *) (sobjp + 4)));
-											ast_debug(3, "      PKTC Error: 0x%.8x\n", pktcerror);
-										} else if (snst == 0x0d01) {
-											reason = ntohs(*((uint16_t *) (sobjp + 4)));
-											subreason = ntohs(*((uint16_t *) (sobjp + 6)));
-											ast_debug(3, "      Reason: %d Subreason: %d\n", reason, subreason);
-										}
-										sobjp += sobjlen;
-										if (!sobjlen)
-											break;
-									}
-									if (scommand == PKTCCOPS_SCOMMAND_GATE_CLOSE || scommand == PKTCCOPS_SCOMMAND_GATE_OPEN) {
-										AST_LIST_LOCK(&gate_list);
-										AST_LIST_TRAVERSE_SAFE_BEGIN(&gate_list, gate, list) {
-											if (gate->cmts == cmts && gate->gateid == gateid) {
-												if (scommand == PKTCCOPS_SCOMMAND_GATE_CLOSE && gate->state != GATE_CLOSED && gate->state != GATE_CLOSED_ERR ) {
-													ast_debug(3, "COPS Gate Close Gate ID: 0x%x TrId: %i CMTS: %s\n", gateid, recvtrid, cmts->name);
-													if (subreason) {
-														gate->state = GATE_CLOSED_ERR;
-														PKTCCOPS_DESTROY_CURRENT_GATE;
-													} else {
-														gate->state = GATE_CLOSED;
-														PKTCCOPS_DESTROY_CURRENT_GATE;
-													}
-													break;
-												} else if (scommand == PKTCCOPS_SCOMMAND_GATE_OPEN && gate->state == GATE_ALLOCATED) {
-													ast_debug(3, "COPS Gate Open Gate ID: 0x%x TrId: %i CMTS: %s\n", gateid, recvtrid, cmts->name);
-													gate->state = GATE_OPEN;
-													if (gate->gate_open) {
-														ast_debug(3, "Calling GATE-OPEN callback function\n");
-														gate->gate_open(gate);
-														gate->gate_open = NULL;
-													}
-													break;
-												}
-											}
-										}
-										AST_LIST_TRAVERSE_SAFE_END;
-										AST_LIST_UNLOCK(&gate_list);
-									} else if (scommand == PKTCCOPS_SCOMMAND_GATE_SET_ACK || scommand == PKTCCOPS_SCOMMAND_GATE_SET_ERR || scommand == PKTCCOPS_SCOMMAND_GATE_INFO_ACK || scommand == PKTCCOPS_SCOMMAND_GATE_INFO_ERR || scommand == PKTCCOPS_SCOMMAND_GATE_DELETE_ACK) {
-										AST_LIST_LOCK(&gate_list);
-										AST_LIST_TRAVERSE_SAFE_BEGIN(&gate_list, gate, list) {
-											if (gate->cmts == cmts && gate->trid == recvtrid) {
-												gate->gateid = gateid;
-												gate->checked = time(NULL);
-												if (scommand == PKTCCOPS_SCOMMAND_GATE_SET_ACK) {
-													ast_debug(3, "COPS Gate Set Ack Gate ID: 0x%x TrId: %i CMTS: %s\n", gateid, recvtrid, cmts->name);
-													gate->state = GATE_ALLOCATED;
-													if (gate->got_dq_gi) {
-														gate->got_dq_gi(gate);
-														gate->got_dq_gi = NULL;
-													}
-												} else if (scommand == PKTCCOPS_SCOMMAND_GATE_SET_ERR) {
-													ast_debug(3, "COPS Gate Set Error TrId: %i ErrorCode: 0x%.8x CMTS: %s\n ", recvtrid, pktcerror, cmts->name);
-													gate->state = GATE_ALLOC_FAILED;
-													if (gate->got_dq_gi) {
-														gate->got_dq_gi(gate);
-														gate->got_dq_gi = NULL;
-													}
-													PKTCCOPS_DESTROY_CURRENT_GATE;
-												} else if (scommand == PKTCCOPS_SCOMMAND_GATE_INFO_ACK) {
-													ast_debug(3, "COPS Gate Info Ack Gate ID: 0x%x TrId: %i CMTS: %s\n", gateid, recvtrid, cmts->name);
-												} else if (scommand == PKTCCOPS_SCOMMAND_GATE_INFO_ERR) {
-													ast_debug(3, "COPS Gate Info Error Gate ID: 0x%x TrId: %i CMTS: %s\n", gateid, recvtrid, cmts->name);
-													gate->state = GATE_ALLOC_FAILED;
-													PKTCCOPS_DESTROY_CURRENT_GATE;
-												} else if (scommand == PKTCCOPS_SCOMMAND_GATE_DELETE_ACK) {
-													ast_debug(3, "COPS Gate Deleted Gate ID: 0x%x TrId: %i CMTS: %s\n", gateid, recvtrid, cmts->name);
-													gate->state = GATE_DELETED;
-													PKTCCOPS_DESTROY_CURRENT_GATE;
-												}
-												gate->in_transaction = 0;
-												break;
-											}
-										}
-										AST_LIST_TRAVERSE_SAFE_END;
-										AST_LIST_UNLOCK(&gate_list);
-									}
-								}
-								pobject = pobject->next;
-							}
-						}
-
-						if (recmsg->opcode == 6 && recmsg->object && recmsg->object->cnum == 11 && recmsg->object->ctype == 1) {
-							ast_debug(3, "COPS: Client open %s\n", cmts->name);
-							sendmsg->msg = NULL;
-							sendmsg->verflag = 0x10;
-							sendmsg->opcode = 7; /* Client Accept */
-							sendmsg->clienttype = 0x8008; /* =PacketCable */
-							sendmsg->length = COPS_HEADER_SIZE + COPS_OBJECT_HEADER_SIZE + 4;
-							sendmsg->object = ast_malloc(sizeof(struct pktcobj));
-							sendmsg->object->length = 4 + COPS_OBJECT_HEADER_SIZE;
-							sendmsg->object->cnum = 10; /* keppalive timer*/
-							sendmsg->object->ctype = 1;
-							sendmsg->object->contents = ast_malloc(sizeof(uint32_t));
-							*((uint32_t *) sendmsg->object->contents) = htonl(cmts->keepalive & 0x0000ffff);
-							sendmsg->object->next = NULL;
-							cops_sendmsg(cmts->sfd, sendmsg);
-							cops_freemsg(sendmsg);
-						} else if (recmsg->opcode == 9) {
-							ast_debug(3, "COPS: Keepalive Request got echoing back %s\n", cmts->name);
-							cops_sendmsg(cmts->sfd, recmsg);
-							cmts->state = 2;
-							cmts->katimer = time(NULL);
-						}
-					}
-					if (len <= 0) {
-						ast_debug(3, "COPS: lost connection to %s\n", cmts->name);
-						close(cmts->sfd);
-						cmts->sfd = -1;
-						cmts->state = 0;
-					}
-					cops_freemsg(recmsg);
-				}
-			}
-			AST_LIST_UNLOCK(&cmts_list);
-		}
-		if (pktcreload) {
-			ast_debug(3, "Reloading pktccops...\n");
-			AST_LIST_LOCK(&gate_list);
-			AST_LIST_LOCK(&cmts_list);
-			pktccops_unregister_ippools();
-			AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
-				cmts->need_delete = 1;
-			}
-			load_pktccops_config();
-			AST_LIST_TRAVERSE_SAFE_BEGIN(&cmts_list, cmts, list) {
-				if (cmts && cmts->need_delete) {
-					AST_LIST_TRAVERSE(&gate_list, gate, list) {
-						if (gate->cmts == cmts) {
-							ast_debug(3, "Null gate %s\n", gate->cmts->name);
-							gate->cmts = NULL;
-						}
-						gate->in_transaction = 0;
-					}
-					AST_LIST_UNLOCK(&gate_list);
-					ast_debug(3, "removing cmts: %s\n", cmts->name);
-					if (cmts->sfd > 0) {
-						close(cmts->sfd);
-					}
-					AST_LIST_REMOVE_CURRENT(list);
-					ast_free(cmts);
-				}
-			}
-			AST_LIST_TRAVERSE_SAFE_END;
-			AST_LIST_UNLOCK(&cmts_list);
-			AST_LIST_UNLOCK(&gate_list);
-			pktcreload = 2;
-		}
-		pthread_testcancel();
-	}
-	return NULL;
-}
-
-static int restart_pktc_thread(void)
-{
-	if (pktccops_thread == AST_PTHREADT_STOP) {
-		return 0;
-	}
-	if (ast_mutex_lock(&pktccops_lock)) {
-		ast_log(LOG_WARNING, "Unable to lock pktccops\n");
-		return -1;
-	}
-	if (pktccops_thread == pthread_self()) {
-		ast_mutex_unlock(&pktccops_lock);
-		ast_log(LOG_WARNING, "Cannot kill myself\n");
-		return -1;
-	}
-	if (pktccops_thread != AST_PTHREADT_NULL) {
-		/* Wake up the thread */
-		pthread_kill(pktccops_thread, SIGURG);
-	} else {
-		/* Start a new monitor */
-		if (ast_pthread_create_background(&pktccops_thread, NULL, do_pktccops, NULL) < 0) {
-			ast_mutex_unlock(&pktccops_lock);
-			ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
-			return -1;
-		}
-	}
-	ast_mutex_unlock(&pktccops_lock);
-	return 0;
-}
-
-static int load_pktccops_config(void)
-{
-	static char *cfg = "res_pktccops.conf";
-	struct ast_config *config;
-	struct ast_variable *v;
-	struct cops_cmts *cmts;
-	struct cops_ippool *new_ippool;
-	const char *host, *cat, *port;
-	int update;
-	int res = 0;
-	uint16_t t1_temp, t7_temp, t8_temp;
-	uint32_t keepalive_temp;
-	unsigned int a,b,c,d,e,f,g,h;
-	struct ast_flags config_flags = {0};
-
-	if (!(config = ast_config_load(cfg, config_flags))) {
-		ast_log(LOG_WARNING, "Unable to load config file res_pktccops.conf\n");
-		return -1;
-	}
-	for (cat = ast_category_browse(config, NULL); cat; cat = ast_category_browse(config, cat)) {
-		if (!strcmp(cat, "general")) {
-			for (v = ast_variable_browse(config, cat); v; v = v->next) {
-				if (!strcasecmp(v->name, "t1")) {
-					t1 = atoi(v->value);
-				} else if (!strcasecmp(v->name, "t7")) {
-					t7 = atoi(v->value);
-				} else if (!strcasecmp(v->name, "t8")) {
-					t8 = atoi(v->value);
-				} else if (!strcasecmp(v->name, "keepalive")) {
-					keepalive = atoi(v->value);
-				} else if (!strcasecmp(v->name, "gateinfoperiod")) {
-					gateinfoperiod = atoi(v->value);
-				} else if (!strcasecmp(v->name, "gatetimeout")) {
-					gatetimeout = atoi(v->value);
-				} else {
-					ast_log(LOG_WARNING, "Unkown option %s in general section of res_ptkccops.conf\n", v->name);
-				}
-			}
-		} else {
-			/* Defaults */
-			host = NULL;
-			port = NULL;
-			t1_temp = t1;
-			t7_temp = t7;
-			t8_temp = t8;
-			keepalive_temp = keepalive;
-
-			for (v = ast_variable_browse(config, cat); v; v = v->next) {
-				if (!strcasecmp(v->name, "host")) {
-					host = v->value;
-				} else if (!strcasecmp(v->name, "port")) {
-					port = v->value;
-				} else if (!strcasecmp(v->name, "t1")) {
-					t1_temp = atoi(v->value);
-				} else if (!strcasecmp(v->name, "t7")) {
-					t7_temp = atoi(v->value);
-				} else if (!strcasecmp(v->name, "t8")) {
-					t8_temp = atoi(v->value);
-				} else if (!strcasecmp(v->name, "keepalive")) {
-					keepalive_temp = atoi(v->value);
-				} else if (!strcasecmp(v->name, "pool")) {
-					/* we weill parse it in 2nd round */
-				} else {
-					ast_log(LOG_WARNING, "Unkown option %s in res_ptkccops.conf\n", v->name);
-				}
-			}
-
-			update = 0;
-			AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
-				if (!strcmp(cmts->name, cat)) {
-					update = 1;
-					break;
-				}
-
-			}
-			if (!update) {
-				cmts = ast_calloc(1, sizeof(*cmts));
-				if (!cmts) {
-					res = -1;
-					break;
-				}
-				AST_LIST_INSERT_HEAD(&cmts_list, cmts, list);
-			}
-			if (cat) {
-				ast_copy_string(cmts->name, cat, sizeof(cmts->name));
-			}
-			if (host) {
-				ast_copy_string(cmts->host, host, sizeof(cmts->host));
-			}
-			if (port) {
-				ast_copy_string(cmts->port, port, sizeof(cmts->port));
-			} else {
-				ast_copy_string(cmts->port, DEFAULT_COPS_PORT, sizeof(cmts->port));
-			}
-
-			cmts->t1 = t1_temp;
-			cmts->t7 = t7_temp;
-			cmts->t8 = t8_temp;
-			cmts->keepalive = keepalive_temp;
-			if (!update) {
-				cmts->state = 0;
-				cmts->sfd = -1;
-			}
-			cmts->need_delete = 0;
-			for (v = ast_variable_browse(config, cat); v; v = v->next) {
-				/* parse ipppol when we have cmts ptr */
-				if (!strcasecmp(v->name, "pool")) {
-					if (sscanf(v->value, "%3u.%3u.%3u.%3u %3u.%3u.%3u.%3u", &a, &b, &c, &d, &e, &f, &g, &h) == 8) {
-						new_ippool = ast_calloc(1, sizeof(*new_ippool));
-						if (!new_ippool) {
-							res = -1;
-							break;
-						}
-						new_ippool->start = a << 24 | b << 16 | c << 8 | d;
-						new_ippool->stop = e << 24 | f << 16 | g << 8 | h;
-						new_ippool->cmts = cmts;
-						pktccops_add_ippool(new_ippool);
-					} else {
-						ast_log(LOG_WARNING, "Invalid ip pool format in res_pktccops.conf\n");
-					}
-				}
-			}
-		}
-	}
-	ast_config_destroy(config);
-	return res;
-}
-
-static char *pktccops_show_cmtses(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	struct cops_cmts *cmts;
-	char statedesc[16];
-	int katimer;
-
-	switch(cmd) {
-	case CLI_INIT:
-		e->command = "pktccops show cmtses";
-		e->usage =
-			"Usage: pktccops show cmtses\n"
-			"       List PacketCable COPS CMTSes.\n";
-
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	ast_cli(a->fd, "%-16s %-24s %-12s %7s\n", "Name        ", "Host                ", "Status    ", "KA timer  ");
-	ast_cli(a->fd, "%-16s %-24s %-12s %7s\n", "------------", "--------------------", "----------", "-----------");
-	AST_LIST_LOCK(&cmts_list);
-	AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
-		katimer = -1;
-		if (cmts->state == 2) {
-			ast_copy_string(statedesc, "Connected", sizeof(statedesc));
-			katimer = (int) (time(NULL) - cmts->katimer);
-		} else if (cmts->state == 1) {
-			ast_copy_string(statedesc, "Connecting", sizeof(statedesc));
-		} else {
-			ast_copy_string(statedesc, "N/A", sizeof(statedesc));
-		}
-		ast_cli(a->fd, "%-16s %-15s:%-8s %-12s %-7d\n", cmts->name, cmts->host, cmts->port, statedesc, katimer);
-	}
-	AST_LIST_UNLOCK(&cmts_list);
-	return CLI_SUCCESS;
-}
-
-static char *pktccops_show_gates(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	struct cops_gate *gate;
-	char state_desc[16];
-
-	switch(cmd) {
-	case CLI_INIT:
-		e->command = "pktccops show gates";
-		e->usage =
-			"Usage: pktccops show gates\n"
-			"       List PacketCable COPS GATEs.\n";
-
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	ast_cli(a->fd, "%-16s %-12s %-12s %-10s %-10s %-10s\n" ,"CMTS", "Gate-Id","MTA", "Status", "AllocTime", "CheckTime");
-	ast_cli(a->fd, "%-16s %-12s %-12s %-10s %-10s %-10s\n" ,"--------------" ,"----------", "----------", "--------", "--------", "--------\n");
-	AST_LIST_LOCK(&cmts_list);
-	AST_LIST_LOCK(&gate_list);
-	AST_LIST_TRAVERSE(&gate_list, gate, list) {
-		if (gate->state == GATE_ALLOC_FAILED) {
-			ast_copy_string(state_desc, "Failed", sizeof(state_desc));
-		} else if (gate->state == GATE_ALLOC_PROGRESS) {
-			ast_copy_string(state_desc, "In Progress", sizeof(state_desc));
-		} else if (gate->state == GATE_ALLOCATED) {
-			ast_copy_string(state_desc, "Allocated", sizeof(state_desc));
-		} else if (gate->state == GATE_CLOSED) {
-			ast_copy_string(state_desc, "Closed", sizeof(state_desc));
-		} else if (gate->state == GATE_CLOSED_ERR) {
-			ast_copy_string(state_desc, "ClosedErr", sizeof(state_desc));
-		} else if (gate->state == GATE_OPEN) {
-			ast_copy_string(state_desc, "Open", sizeof(state_desc));
-		} else if (gate->state == GATE_DELETED) {
-			ast_copy_string(state_desc, "Deleted", sizeof(state_desc));
-		} else {
-			ast_copy_string(state_desc, "N/A", sizeof(state_desc));
-		}
-
-		ast_cli(a->fd, "%-16s 0x%.8x   0x%08x   %-10s %10i %10i %u\n", (gate->cmts) ? gate->cmts->name : "null" , gate->gateid, gate->mta,
-			state_desc, (int) (time(NULL) - gate->allocated), (gate->checked) ? (int) (time(NULL) - gate->checked) : 0, (unsigned int) gate->in_transaction);
-	}
-	AST_LIST_UNLOCK(&cmts_list);
-	AST_LIST_UNLOCK(&gate_list);
-	return CLI_SUCCESS;
-}
-
-static char *pktccops_show_pools(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	struct cops_ippool *ippool;
-	char start[32];
-	char stop[32];
-
-	switch(cmd) {
-	case CLI_INIT:
-		e->command = "pktccops show pools";
-		e->usage =
-			"Usage: pktccops show pools\n"
-			"       List PacketCable COPS ip pools of MTAs.\n";
-
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	ast_cli(a->fd, "%-16s %-18s %-7s\n", "Start     ", "Stop      ", "CMTS    ");
-	ast_cli(a->fd, "%-16s %-18s %-7s\n", "----------", "----------", "--------");
-	AST_LIST_LOCK(&ippool_list);
-	AST_LIST_TRAVERSE(&ippool_list, ippool, list) {
-		snprintf(start, sizeof(start), "%3u.%3u.%3u.%3u", ippool->start >> 24, (ippool->start >> 16) & 0x000000ff, (ippool->start >> 8) & 0x000000ff, ippool->start & 0x000000ff);
-
-		snprintf(stop, sizeof(stop), "%3u.%3u.%3u.%3u", ippool->stop >> 24, (ippool->stop >> 16) & 0x000000ff, (ippool->stop >> 8) & 0x000000ff, ippool->stop & 0x000000ff);
-		ast_cli(a->fd, "%-16s %-18s %-16s\n", start, stop, ippool->cmts->name);
-	}
-	AST_LIST_UNLOCK(&ippool_list);
-	return CLI_SUCCESS;
-}
-
-static char *pktccops_gatedel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	int found = 0;
-	int trid;
-	uint32_t gateid;
-	struct cops_gate *gate;
-	struct cops_cmts *cmts;
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "pktccops gatedel";
-		e->usage =
-			"Usage: pktccops gatedel <cmts> <gateid>\n"
-			"       Send Gate-Del to cmts.\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	if (a->argc < 4)
-		return CLI_SHOWUSAGE;
-
-	AST_LIST_LOCK(&cmts_list);
-	AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
-		if (!strcmp(cmts->name, a->argv[2])) {
-			ast_cli(a->fd, "Found cmts: %s\n", cmts->name);
-			found = 1;
-			break;
-		}
-	}
-	AST_LIST_UNLOCK(&cmts_list);
-
-	if (!found)
-		return CLI_SHOWUSAGE;
-
-	trid = cops_trid++;
-	if (!sscanf(a->argv[3], "%x", &gateid)) {
-		ast_cli(a->fd, "bad gate specification (%s)\n", a->argv[3]);
-		return CLI_SHOWUSAGE;
-	}
-
-	found = 0;
-	AST_LIST_LOCK(&gate_list);
-	AST_LIST_TRAVERSE(&gate_list, gate, list) {
-		if (gate->gateid == gateid && gate->cmts == cmts) {
-			found = 1;
-			break;
-		}
-	}
-
-	if (!found) {
-		ast_cli(a->fd, "gate not found: %s\n", a->argv[3]);
-		return CLI_SHOWUSAGE;
-	}
-
-	AST_LIST_UNLOCK(&gate_list);
-	cops_gate_cmd(GATE_DEL, cmts, trid, 0, 0, 0, 0, 0, 0, gate);
-	return CLI_SUCCESS;
-}
-
-static char *pktccops_gateset(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	int foundcmts = 0;
-	int trid;
-	unsigned int an,bn,cn,dn;
-	uint32_t mta, ssip;
-	struct cops_cmts *cmts;
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "pktccops gateset";
-		e->usage =
-			"Usage: pktccops gateset <cmts> <mta> <actcount> <bitrate> <packet size> <switch ip> <switch port>\n"
-			"       Send Gate-Set to cmts.\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	if (a->argc < 9)
-		return CLI_SHOWUSAGE;
-
-	if (!strcmp(a->argv[2], "null")) {
-		cmts = NULL;
-	} else {
-		AST_LIST_LOCK(&cmts_list);
-		AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
-			if (!strcmp(cmts->name, a->argv[2])) {
-				ast_cli(a->fd, "Found cmts: %s\n", cmts->name);
-				foundcmts = 1;
-				break;
-			}
-		}
-		AST_LIST_UNLOCK(&cmts_list);
-		if (!foundcmts) {
-			ast_cli(a->fd, "CMTS not found: %s\n", a->argv[2]);
-			return CLI_SHOWUSAGE;
-		}
-	}
-
-	trid = cops_trid++;
-	if (sscanf(a->argv[3], "%3u.%3u.%3u.%3u", &an, &bn, &cn, &dn) != 4) {
-		ast_cli(a->fd, "MTA specification (%s) does not look like an ipaddr\n", a->argv[3]);
-		return CLI_SHOWUSAGE;
-	}
-	mta = an << 24 | bn << 16 | cn << 8 | dn;
-
-	if (sscanf(a->argv[7], "%3u.%3u.%3u.%3u", &an, &bn, &cn, &dn) != 4) {
-		ast_cli(a->fd, "SSIP specification (%s) does not look like an ipaddr\n", a->argv[7]);
-		return CLI_SHOWUSAGE;
-	}
-	ssip = an << 24 | bn << 16 | cn << 8 | dn;
-
-	cops_gate_cmd(GATE_SET, cmts, trid, mta, atoi(a->argv[4]), atof(a->argv[5]), atoi(a->argv[6]), ssip, atoi(a->argv[8]), NULL);
-	return CLI_SUCCESS;
-}
-
-static struct ast_cli_entry cli_pktccops[] = {
-	AST_CLI_DEFINE(pktccops_show_cmtses, "List PacketCable COPS CMTSes"),
-	AST_CLI_DEFINE(pktccops_show_gates, "List PacketCable COPS GATEs"),
-	AST_CLI_DEFINE(pktccops_show_pools, "List PacketCable MTA pools"),
-	AST_CLI_DEFINE(pktccops_gateset, "Send Gate-Set to cmts"),
-	AST_CLI_DEFINE(pktccops_gatedel, "Send Gate-Det to cmts"),
-};
-
-static int pktccops_add_ippool(struct cops_ippool *ippool)
-{
-	if (ippool) {
-		AST_LIST_LOCK(&ippool_list);
-		AST_LIST_INSERT_HEAD(&ippool_list, ippool, list);
-		AST_LIST_UNLOCK(&ippool_list);
-		return 0;
-	} else {
-		ast_log(LOG_WARNING, "Attempted to register NULL ippool?\n");
-		return -1;
-	}
-}
-
-static void pktccops_unregister_cmtses(void)
-{
-	struct cops_cmts *cmts;
-	struct cops_gate *gate;
-	AST_LIST_LOCK(&cmts_list);
-	while ((cmts = AST_LIST_REMOVE_HEAD(&cmts_list, list))) {
-		if (cmts->sfd > 0) {
-			close(cmts->sfd);
-		}
-		ast_free(cmts);
-	}
-	AST_LIST_UNLOCK(&cmts_list);
-
-	AST_LIST_LOCK(&gate_list);
-	while ((gate = AST_LIST_REMOVE_HEAD(&gate_list, list))) {
-		ast_free(gate);
-	}
-	AST_LIST_UNLOCK(&gate_list);
-}
-
-static void pktccops_unregister_ippools(void)
-{
-	struct cops_ippool *ippool;
-	AST_LIST_LOCK(&ippool_list);
-	while ((ippool = AST_LIST_REMOVE_HEAD(&ippool_list, list))) {
-		ast_free(ippool);
-	}
-	AST_LIST_UNLOCK(&ippool_list);
-}
-
-static int load_module(void)
-{
-	int res;
-	AST_LIST_LOCK(&cmts_list);
-	res = load_pktccops_config();
-	AST_LIST_UNLOCK(&cmts_list);
-	if (res == -1) {
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	ast_cli_register_multiple(cli_pktccops, sizeof(cli_pktccops) / sizeof(struct ast_cli_entry));
-	restart_pktc_thread();
-
-	return 0;
-}
-
-static int unload_module(void)
-{
-	if (!ast_mutex_lock(&pktccops_lock)) {
-		if ((pktccops_thread != AST_PTHREADT_NULL) && (pktccops_thread != AST_PTHREADT_STOP)) {
-			pthread_cancel(pktccops_thread);
-			pthread_kill(pktccops_thread, SIGURG);
-			pthread_join(pktccops_thread, NULL);
-		}
-		pktccops_thread = AST_PTHREADT_STOP;
-		ast_mutex_unlock(&pktccops_lock);
-	} else {
-		ast_log(LOG_ERROR, "Unable to lock the pktccops_thread\n");
-		return -1;
-	}
-
-	ast_cli_unregister_multiple(cli_pktccops, sizeof(cli_pktccops) / sizeof(struct ast_cli_entry));
-	pktccops_unregister_cmtses();
-	pktccops_unregister_ippools();
-	pktccops_thread = AST_PTHREADT_NULL;
-	return 0;
-}
-
-static int reload_module(void)
-{
-	/* Prohibit unloading */
-	if (pktcreload) {
-		ast_log(LOG_NOTICE, "Previous reload in progress, please wait!\n");
-		return -1;
-	}
-	pktcreload = 1;
-	return 0;
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PktcCOPS manager for MGCP",
-	.support_level = AST_MODULE_SUPPORT_DEPRECATED,
-	.load = load_module,
-	.unload = unload_module,
-	.reload = reload_module,
-);
diff --git a/res/res_pktccops.exports.in b/res/res_pktccops.exports.in
deleted file mode 100644
index 1892e5b..0000000
--- a/res/res_pktccops.exports.in
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	global:
-		LINKER_SYMBOL_PREFIXast_pktccops_gate_alloc;
-	local:
-		*;
-};
diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh
index 6d06f05..8c5c8d4 100755
--- a/tests/CI/buildAsterisk.sh
+++ b/tests/CI/buildAsterisk.sh
@@ -156,13 +156,13 @@
 		mod_disables+=" cdr_adaptive_odbc cdr_custom cdr_manager cdr_odbc cdr_pgsql cdr_radius"
 		mod_disables+=" cdr_tds"
 		mod_disables+=" cel_odbc cel_pgsql cel_radius cel_sqlite3_custom cel_tds"
-		mod_disables+=" chan_alsa chan_console chan_mgcp chan_motif chan_rtp chan_skinny chan_unistim"
+		mod_disables+=" chan_alsa chan_console chan_motif chan_rtp chan_skinny chan_unistim"
 		mod_disables+=" func_frame_trace func_pitchshift func_speex func_volume func_dialgroup"
 		mod_disables+=" func_periodic_hook func_sprintf func_enum func_extstate func_sysinfo func_iconv"
 		mod_disables+=" func_callcompletion func_version func_rand func_sha1 func_module func_md5"
 		mod_disables+=" pbx_dundi pbx_loopback"
 		mod_disables+=" res_ael_share res_calendar res_config_ldap res_config_pgsql res_corosync"
-		mod_disables+=" res_http_post res_pktccops res_rtp_multicast res_snmp res_xmpp"
+		mod_disables+=" res_http_post res_rtp_multicast res_snmp res_xmpp"
 	fi
 
 	runner menuselect/menuselect `gen_mods disable $mod_disables` menuselect.makeopts

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

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I41a316d327646a197b6f112f7f637aceb5111b41
Gerrit-Change-Number: 19566
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Bradeen <mbradeen at sangoma.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20221115/662b4a3f/attachment-0001.html>


More information about the asterisk-code-review mailing list