[Pkg-voip-commits] r5461 - in /asterisk/trunk/debian/patches: ./ bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Apr 3 02:54:28 UTC 2008
Author: paravoid
Date: Thu Apr 3 02:54:28 2008
New Revision: 5461
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5461
Log:
reduce patch offsets by doing a quilt refresh
Modified:
asterisk/trunk/debian/patches/bristuff/answer-before-say
asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
asterisk/trunk/debian/patches/bristuff/app-dial-etc
asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows
asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
asterisk/trunk/debian/patches/bristuff/ast-send-message
asterisk/trunk/debian/patches/bristuff/ast-send-message-users
asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME
asterisk/trunk/debian/patches/bristuff/feature-autoanswer
asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
asterisk/trunk/debian/patches/feature-bridge
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
asterisk/trunk/debian/patches/misdn_FOP
asterisk/trunk/debian/patches/safe_asterisk-nobg
asterisk/trunk/debian/patches/silence-buildsum-warning
asterisk/trunk/debian/patches/use-libpri-bristuffed
Modified: asterisk/trunk/debian/patches/bristuff/answer-before-say
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/answer-before-say?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/trunk/debian/patches/bristuff/answer-before-say Thu Apr 3 02:54:28 2008
@@ -3,7 +3,7 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -6065,6 +6065,9 @@ static int pbx_builtin_saynumber(struct
+@@ -6074,6 +6074,9 @@ static int pbx_builtin_saynumber(struct
return -1;
}
}
@@ -13,7 +13,7 @@
return ast_say_number(chan, atoi(tmp), "", chan->language, options);
}
-@@ -6072,8 +6075,12 @@ static int pbx_builtin_saydigits(struct
+@@ -6081,8 +6084,12 @@ static int pbx_builtin_saydigits(struct
{
int res = 0;
@@ -27,7 +27,7 @@
return res;
}
-@@ -6081,8 +6088,12 @@ static int pbx_builtin_saycharacters(str
+@@ -6090,8 +6097,12 @@ static int pbx_builtin_saycharacters(str
{
int res = 0;
@@ -41,7 +41,7 @@
return res;
}
-@@ -6090,8 +6101,12 @@ static int pbx_builtin_sayphonetic(struc
+@@ -6099,8 +6110,12 @@ static int pbx_builtin_sayphonetic(struc
{
int res = 0;
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband Thu Apr 3 02:54:28 2008
@@ -43,7 +43,7 @@
ast_indicate(in, AST_CONTROL_PROGRESS);
break;
case AST_CONTROL_VIDUPDATE:
-@@ -646,7 +650,7 @@ static struct ast_channel *wait_for_answ
+@@ -651,7 +655,7 @@ static struct ast_channel *wait_for_answ
ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
@@ -52,7 +52,7 @@
ast_indicate(in, AST_CONTROL_PROCEEDING);
break;
case AST_CONTROL_HOLD:
-@@ -664,7 +668,7 @@ static struct ast_channel *wait_for_answ
+@@ -669,7 +673,7 @@ static struct ast_channel *wait_for_answ
/* Ignore going off hook and flash */
break;
case -1:
@@ -61,7 +61,7 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "%s stopped sounds\n", c->name);
ast_indicate(in, -1);
-@@ -1104,7 +1108,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1091,7 +1095,7 @@ static int dial_exec_full(struct ast_cha
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
}
@@ -70,7 +70,7 @@
/* loop through the list of dial destinations */
rest = args.peers;
while ((cur = strsep(&rest, "&")) ) {
-@@ -1129,7 +1133,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1116,7 +1120,7 @@ static int dial_exec_full(struct ast_cha
OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
OPT_CALLEE_PARK | OPT_CALLER_PARK |
@@ -79,7 +79,7 @@
ast_set2_flag(tmp, args.url, DIAL_NOFORWARDHTML);
}
ast_copy_string(numsubst, number, sizeof(numsubst));
-@@ -1332,7 +1336,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1319,7 +1323,7 @@ static int dial_exec_full(struct ast_cha
ast_moh_start(chan, NULL, NULL);
}
ast_indicate(chan, AST_CONTROL_PROGRESS);
@@ -88,7 +88,7 @@
ast_indicate(chan, AST_CONTROL_RINGING);
sentringing++;
}
-@@ -1449,7 +1453,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1436,7 +1440,7 @@ static int dial_exec_full(struct ast_cha
if (ast_test_flag(&opts, OPT_MUSICBACK)) {
ast_moh_stop(chan);
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-c-callback?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-c-callback (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-c-callback Thu Apr 3 02:54:28 2008
@@ -51,7 +51,7 @@
}
break;
case AST_CONTROL_PROGRESS:
-@@ -1108,7 +1117,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1095,7 +1104,7 @@ static int dial_exec_full(struct ast_cha
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
}
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-etc
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-etc?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-etc (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-etc Thu Apr 3 02:54:28 2008
@@ -8,7 +8,7 @@
static char *app = "Dial";
-@@ -1659,23 +1660,25 @@ static int dial_exec_full(struct ast_cha
+@@ -1646,23 +1647,25 @@ static int dial_exec_full(struct ast_cha
ast_set_flag(&(config.features_caller), AST_FEATURE_PLAY_WARNING);
if (play_to_callee)
ast_set_flag(&(config.features_callee), AST_FEATURE_PLAY_WARNING);
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-priority-202?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 Thu Apr 3 02:54:28 2008
@@ -21,7 +21,7 @@
" k - Allow the called party to enable parking of the call by sending\n"
" the DTMF sequence defined for call parking in features.conf.\n"
" K - Allow the calling party to enable parking of the call by sending\n"
-@@ -1305,14 +1310,16 @@ static int dial_exec_full(struct ast_cha
+@@ -1292,14 +1297,16 @@ static int dial_exec_full(struct ast_cha
}
if (!outgoing) {
Modified: asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows (original)
+++ asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows Thu Apr 3 02:54:28 2008
@@ -20,7 +20,7 @@
bi.txbufpolicy = ZT_POLICY_IMMEDIATE;
bi.rxbufpolicy = ZT_POLICY_IMMEDIATE;
bi.numbufs = audio_buffers;
-@@ -1913,6 +1914,14 @@ static int conf_run(struct ast_channel *
+@@ -1915,6 +1916,14 @@ static int conf_run(struct ast_channel *
f = ast_read(c);
if (!f)
break;
Modified: asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-device-state-CID?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Thu Apr 3 02:54:28 2008
@@ -120,7 +120,7 @@
} else {
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -593,8 +593,13 @@ int ast_channel_datastore_remove(struct
+@@ -608,8 +608,13 @@ int ast_channel_datastore_remove(struct
/*! \brief Find a datastore on a channel */
struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, char *uid);
@@ -137,7 +137,7 @@
\return Returns NULL on failure to allocate.
--- a/main/channel.c
+++ b/main/channel.c
-@@ -1255,7 +1255,7 @@ void ast_channel_free(struct ast_channel
+@@ -1261,7 +1261,7 @@ void ast_channel_free(struct ast_channel
free(chan);
AST_LIST_UNLOCK(&channels);
@@ -146,7 +146,7 @@
}
struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid)
-@@ -3606,7 +3606,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3634,7 +3634,7 @@ void ast_set_callerid(struct ast_channel
ast_channel_unlock(chan);
}
@@ -155,7 +155,7 @@
{
int oldstate = chan->_state;
-@@ -3614,7 +3614,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3642,7 +3642,7 @@ int ast_setstate(struct ast_channel *cha
return 0;
chan->_state = state;
@@ -164,7 +164,7 @@
/* setstate used to conditionally report Newchannel; this is no more */
manager_event(EVENT_FLAG_CALL,
"Newstate",
-@@ -3631,6 +3631,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3659,6 +3659,11 @@ int ast_setstate(struct ast_channel *cha
return 0;
}
@@ -198,7 +198,7 @@
}
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -2011,7 +2011,7 @@ int ast_extension_state(struct ast_chann
+@@ -2022,7 +2022,7 @@ int ast_extension_state(struct ast_chann
return ast_extension_state2(e); /* Check all devices in the hint */
}
@@ -207,7 +207,7 @@
{
struct ast_hint *hint;
-@@ -2042,11 +2042,11 @@ void ast_hint_state_changed(const char *
+@@ -2053,11 +2053,11 @@ void ast_hint_state_changed(const char *
/* For general callbacks */
for (cblist = statecbs; cblist; cblist = cblist->next)
@@ -221,7 +221,7 @@
hint->laststate = state; /* record we saw the change */
}
-@@ -2241,7 +2241,7 @@ static int ast_remove_hint(struct ast_ex
+@@ -2252,7 +2252,7 @@ static int ast_remove_hint(struct ast_ex
/* Notify with -1 and remove all callbacks */
cbprev = cblist;
cblist = cblist->next;
@@ -230,7 +230,7 @@
free(cbprev);
}
hint->callbacks = NULL;
-@@ -4008,7 +4008,7 @@ void ast_merge_contexts_and_delete(struc
+@@ -4019,7 +4019,7 @@ void ast_merge_contexts_and_delete(struc
while (thiscb) {
prevcb = thiscb;
thiscb = thiscb->next;
@@ -241,7 +241,7 @@
} else {
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1343,7 +1343,7 @@ static void ast_quiet_chan(struct ast_ch
+@@ -1342,7 +1342,7 @@ static void ast_quiet_chan(struct ast_ch
static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target);
/*--- Device monitoring and Device/extension state handling */
@@ -250,7 +250,7 @@
static int sip_devicestate(void *data);
static int sip_poke_noanswer(const void *data);
static int sip_poke_peer(struct sip_peer *peer);
-@@ -8471,7 +8471,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8538,7 +8538,7 @@ static void sip_peer_hold(struct sip_pvt
/*! \brief Callback for the devicestate notification (SUBSCRIBE) support subsystem
\note If you add an "hint" priority to the extension in the dial plan,
you will get notifications on device state changes */
@@ -259,7 +259,7 @@
{
struct sip_pvt *p = data;
-@@ -12642,7 +12642,7 @@ static void handle_response(struct sip_p
+@@ -12709,7 +12709,7 @@ static void handle_response(struct sip_p
if (ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE)) {
/* Ready to send the next state we have on queue */
ast_clear_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
@@ -270,7 +270,7 @@
} else if (sipmethod == SIP_REGISTER)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
-@@ -697,7 +697,7 @@ static void *device_state_thread(void *d
+@@ -721,7 +721,7 @@ static void *device_state_thread(void *d
return NULL;
}
/*! \brief Producer of the statechange queue */
Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-send-message?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Thu Apr 3 02:54:28 2008
@@ -3,7 +3,7 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -230,7 +230,7 @@ struct ast_channel_tech {
+@@ -245,7 +245,7 @@ struct ast_channel_tech {
int (* const write)(struct ast_channel *chan, struct ast_frame *frame);
/*! \brief Display or transmit text */
@@ -12,7 +12,7 @@
/*! \brief Display or send an image */
int (* const send_image)(struct ast_channel *chan, struct ast_frame *frame);
-@@ -674,6 +674,16 @@ struct ast_channel *ast_request_and_dial
+@@ -689,6 +689,16 @@ struct ast_channel *ast_request_and_dial
struct ast_channel *__ast_request_and_dial(const char *type, int format, void *data, int timeout, int *reason, const char *cidnum, const char *cidname, struct outgoing_helper *oh);
@@ -29,7 +29,7 @@
/*!\brief Register a channel technology (a new channel driver)
* Called by a channel module to register the kind of channels it supports.
* \param tech Structure defining channel technology or "type"
-@@ -890,10 +900,12 @@ int ast_set_write_format(struct ast_chan
+@@ -905,10 +915,12 @@ int ast_set_write_format(struct ast_chan
/*! \brief Sends text to a channel
* Write text to a display on a channel
* \param chan channel to act upon
@@ -45,7 +45,7 @@
* \param chan channel to act upon
--- a/main/channel.c
+++ b/main/channel.c
-@@ -2414,7 +2414,7 @@ char *ast_recvtext(struct ast_channel *c
+@@ -2435,7 +2435,7 @@ char *ast_recvtext(struct ast_channel *c
return buf;
}
@@ -54,7 +54,7 @@
{
int res = 0;
/* Stop if we're a zombie or need a soft hangup */
-@@ -2422,7 +2422,7 @@ int ast_sendtext(struct ast_channel *cha
+@@ -2443,7 +2443,7 @@ int ast_sendtext(struct ast_channel *cha
return -1;
CHECK_BLOCKING(chan);
if (chan->tech->send_text)
@@ -63,7 +63,7 @@
ast_clear_flag(chan, AST_FLAG_BLOCKING);
return res;
}
-@@ -2613,7 +2613,7 @@ int ast_write(struct ast_channel *chan,
+@@ -2634,7 +2634,7 @@ int ast_write(struct ast_channel *chan,
break;
case AST_FRAME_TEXT:
res = (chan->tech->send_text == NULL) ? 0 :
@@ -72,7 +72,7 @@
break;
case AST_FRAME_HTML:
res = (chan->tech->send_html == NULL) ? 0 :
-@@ -4450,6 +4450,25 @@ void ast_channel_stop_silence_generator(
+@@ -4487,6 +4487,25 @@ void ast_channel_stop_silence_generator(
}
@@ -178,7 +178,7 @@
static int local_devicestate(void *data);
/* PBX interface structure for channel registration */
-@@ -400,7 +400,7 @@ static int local_digit_end(struct ast_ch
+@@ -407,7 +407,7 @@ static int local_digit_end(struct ast_ch
return res;
}
@@ -218,7 +218,7 @@
static int phone_fixup(struct ast_channel *old, struct ast_channel *new);
static int phone_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen);
-@@ -640,7 +640,7 @@ static int phone_write_buf(struct phone_
+@@ -643,7 +643,7 @@ static int phone_write_buf(struct phone_
return len;
}
@@ -229,7 +229,7 @@
return phone_write_buf(ast->tech_pvt, text, length, length, 0) ==
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1220,7 +1220,7 @@ static struct ast_config *notify_types;
+@@ -1219,7 +1219,7 @@ static struct ast_config *notify_types;
/*--- PBX interface functions */
static struct ast_channel *sip_request_call(const char *type, int format, void *data, int *cause);
static int sip_devicestate(void *data);
@@ -238,7 +238,7 @@
static int sip_call(struct ast_channel *ast, char *dest, int timeout);
static int sip_hangup(struct ast_channel *ast);
static int sip_answer(struct ast_channel *ast);
-@@ -2352,7 +2352,7 @@ static char *get_in_brackets(char *tmp)
+@@ -2371,7 +2371,7 @@ static char *get_in_brackets(char *tmp)
/*! \brief Send SIP MESSAGE text within a call
Called from PBX core sendtext() application */
@@ -249,7 +249,7 @@
int debug = sip_debug_test_pvt(p);
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
-@@ -831,7 +831,7 @@ static int iax2_provision(struct sockadd
+@@ -833,7 +833,7 @@ static int iax2_provision(struct sockadd
static int iax2_send(struct chan_iax2_pvt *pvt, struct ast_frame *f, unsigned int ts, int seqno, int now, int transfer, int final);
static int iax2_sendhtml(struct ast_channel *c, int subclass, const char *data, int datalen);
static int iax2_sendimage(struct ast_channel *c, struct ast_frame *img);
@@ -258,7 +258,7 @@
static int iax2_setoption(struct ast_channel *c, int option, void *data, int datalen);
static int iax2_transfer(struct ast_channel *c, const char *dest);
static int iax2_write(struct ast_channel *c, struct ast_frame *f);
-@@ -2624,7 +2624,7 @@ static int iax2_digit_end(struct ast_cha
+@@ -2629,7 +2629,7 @@ static int iax2_digit_end(struct ast_cha
return send_command_locked(PTR_TO_CALLNO(c->tech_pvt), AST_FRAME_DTMF_END, digit, 0, NULL, 0, -1);
}
Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message-users
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-send-message-users?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message-users (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message-users Thu Apr 3 02:54:28 2008
@@ -60,7 +60,7 @@
static char mandescr_setvar[] =
"Description: Set a global or local channel variable.\n"
"Variables: (Names marked with * are required)\n"
-@@ -2835,6 +2881,7 @@ int init_manager(void)
+@@ -2840,6 +2886,7 @@ int init_manager(void)
ast_manager_register2("Events", 0, action_events, "Control Event Flow", mandescr_events);
ast_manager_register2("Logoff", 0, action_logoff, "Logoff Manager", mandescr_logoff);
ast_manager_register2("Hangup", EVENT_FLAG_CALL, action_hangup, "Hangup Channel", mandescr_hangup);
Modified: asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript Thu Apr 3 02:54:28 2008
@@ -95,7 +95,7 @@
ast_channel_unlock(c);
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
-@@ -2901,13 +2901,13 @@ static int try_calling(struct queue_ent
+@@ -2880,13 +2880,13 @@ static int try_calling(struct queue_ent
else
which = peer;
if (monitorfilename)
Modified: asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause Thu Apr 3 02:54:28 2008
@@ -10,7 +10,7 @@
* 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.
-@@ -3235,7 +3238,7 @@ static int iax2_hangup(struct ast_channe
+@@ -3243,7 +3246,7 @@ static int iax2_hangup(struct ast_channe
ast_mutex_lock(&iaxsl[callno]);
if (callno && iaxs[callno]) {
if (option_debug)
@@ -19,7 +19,7 @@
alreadygone = ast_test_flag(iaxs[callno], IAX_ALREADYGONE);
/* Send the hangup unless we have had a transmission error or are already gone */
iax_ie_append_byte(&ied, IAX_IE_CAUSECODE, (unsigned char)c->hangupcause);
-@@ -3289,7 +3292,8 @@ static int iax2_setoption(struct ast_cha
+@@ -3297,7 +3300,8 @@ static int iax2_setoption(struct ast_cha
static struct ast_frame *iax2_read(struct ast_channel *c)
{
Modified: asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME (original)
+++ asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME Thu Apr 3 02:54:28 2008
@@ -10,7 +10,7 @@
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -2387,6 +2387,7 @@ static void ast_readconfig(void)
+@@ -2389,6 +2389,7 @@ static void ast_readconfig(void)
ast_copy_string(ast_config_AST_PID, AST_PID, sizeof(ast_config_AST_PID));
ast_copy_string(ast_config_AST_SOCKET, AST_SOCKET, sizeof(ast_config_AST_SOCKET));
ast_copy_string(ast_config_AST_RUN_DIR, AST_RUN_DIR, sizeof(ast_config_AST_RUN_DIR));
@@ -18,7 +18,7 @@
/* no asterisk.conf? no problem, use buildtime config! */
if (!cfg) {
-@@ -2511,6 +2512,8 @@ static void ast_readconfig(void)
+@@ -2513,6 +2514,8 @@ static void ast_readconfig(void)
ast_copy_string(ast_config_AST_RUN_GROUP, v->value, sizeof(ast_config_AST_RUN_GROUP));
} else if (!strcasecmp(v->name, "systemname")) {
ast_copy_string(ast_config_AST_SYSTEM_NAME, v->value, sizeof(ast_config_AST_SYSTEM_NAME));
Modified: asterisk/trunk/debian/patches/bristuff/feature-autoanswer
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-autoanswer?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-autoanswer (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-autoanswer Thu Apr 3 02:54:28 2008
@@ -83,7 +83,7 @@
);
if (peer && adsipark && ast_adsi_available(peer)) {
-@@ -1636,11 +1673,13 @@ static void post_manager_event(const cha
+@@ -1638,11 +1675,13 @@ static void post_manager_event(const cha
"Exten: %s\r\n"
"Channel: %s\r\n"
"CallerID: %s\r\n"
@@ -99,7 +99,7 @@
);
}
-@@ -1908,10 +1947,12 @@ static int park_exec(struct ast_channel
+@@ -1910,10 +1949,12 @@ static int park_exec(struct ast_channel
"Channel: %s\r\n"
"From: %s\r\n"
"CallerID: %s\r\n"
@@ -114,7 +114,7 @@
);
free(pu);
-@@ -2065,15 +2106,10 @@ static struct ast_cli_entry cli_show_fea
+@@ -2067,15 +2108,10 @@ static struct ast_cli_entry cli_show_fea
handle_showfeatures, NULL,
NULL };
@@ -133,7 +133,7 @@
/*! \brief Dump lot status */
static int manager_parking_status( struct mansession *s, const struct message *m)
-@@ -2097,12 +2133,13 @@ static int manager_parking_status( struc
+@@ -2099,12 +2135,13 @@ static int manager_parking_status( struc
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
@@ -148,7 +148,7 @@
idText);
}
-@@ -2177,6 +2214,427 @@ static int manager_park(struct mansessio
+@@ -2179,6 +2216,427 @@ static int manager_park(struct mansessio
return 0;
}
@@ -576,7 +576,7 @@
int ast_pickup_call(struct ast_channel *chan)
{
-@@ -2440,6 +2898,7 @@ static int load_config(void)
+@@ -2442,6 +2900,7 @@ static int load_config(void)
static int reload(void)
{
@@ -584,7 +584,7 @@
return load_config();
}
-@@ -2463,6 +2922,12 @@ static int load_module(void)
+@@ -2465,6 +2924,12 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -597,7 +597,7 @@
res |= ast_devstate_prov_add("Park", metermaidstate);
return res;
-@@ -2477,6 +2942,8 @@ static int unload_module(void)
+@@ -2479,6 +2944,8 @@ static int unload_module(void)
ast_manager_unregister("Park");
ast_cli_unregister_multiple(cli_features, sizeof(cli_features) / sizeof(struct ast_cli_entry));
ast_unregister_application(parkcall);
Modified: asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-holdedcalls?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-holdedcalls (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-holdedcalls Thu Apr 3 02:54:28 2008
@@ -71,7 +71,7 @@
char *ast_parking_ext(void)
{
return parking_ext;
-@@ -2032,6 +2056,282 @@ static int park_exec(struct ast_channel
+@@ -2034,6 +2058,282 @@ static int park_exec(struct ast_channel
return res;
}
@@ -354,7 +354,7 @@
static int handle_showfeatures(int fd, int argc, char *argv[])
{
int i;
-@@ -2913,6 +3213,7 @@ static int load_module(void)
+@@ -2915,6 +3215,7 @@ static int load_module(void)
return res;
ast_cli_register_multiple(cli_features, sizeof(cli_features) / sizeof(struct ast_cli_entry));
ast_pthread_create(&parking_thread, NULL, do_parking_thread, NULL);
@@ -362,7 +362,7 @@
res = ast_register_application(parkedcall, park_exec, synopsis, descrip);
if (!res)
res = ast_register_application(parkcall, park_call_exec, synopsis2, descrip2);
-@@ -2922,6 +3223,7 @@ static int load_module(void)
+@@ -2924,6 +3225,7 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -370,7 +370,7 @@
ast_pthread_create(&autoanswer_thread, NULL, do_autoanswer_thread, NULL);
if (!res)
res |= ast_register_application(autoanswerlogin, autoanswer_login_exec, synopsis3, descrip3);
-@@ -2944,6 +3246,7 @@ static int unload_module(void)
+@@ -2946,6 +3248,7 @@ static int unload_module(void)
ast_unregister_application(parkcall);
ast_unregister_application(autoanswer);
ast_unregister_application(autoanswerlogin);
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Thu Apr 3 02:54:28 2008
@@ -2,7 +2,7 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -662,6 +662,18 @@ void ast_channel_free(struct ast_channe
+@@ -677,6 +677,18 @@ void ast_channel_free(struct ast_channe
*/
struct ast_channel *ast_request(const char *type, int format, void *data, int *status);
@@ -21,7 +21,7 @@
/*!
* \brief Request a channel of a given type, with data as optional information used
* by the low level module and attempt to place a call on it
-@@ -675,9 +687,9 @@ struct ast_channel *ast_request(const ch
+@@ -690,9 +702,9 @@ struct ast_channel *ast_request(const ch
* \return Returns an ast_channel on success or no answer, NULL on failure. Check the value of chan->_state
* to know if the call was answered or not.
*/
@@ -33,7 +33,7 @@
/*! \brief "Requests" a channel for sending a message
* \param type type of channel to request
-@@ -962,6 +974,8 @@ struct ast_channel *ast_get_channel_by_e
+@@ -977,6 +989,8 @@ struct ast_channel *ast_get_channel_by_e
/*! \brief Get next channel by exten (and optionally context) and lock it */
struct ast_channel *ast_walk_channel_by_exten_locked(const struct ast_channel *chan, const char *exten,
const char *context);
@@ -116,7 +116,7 @@
}
/*! \brief Wait, look for hangups and condition arg */
-@@ -1202,8 +1210,10 @@ void ast_channel_free(struct ast_channel
+@@ -1213,8 +1221,10 @@ void ast_channel_free(struct ast_channel
free(chan->tech_pvt);
}
@@ -129,7 +129,7 @@
ast_copy_string(name, chan->name, sizeof(name));
-@@ -2800,7 +2810,7 @@ char *ast_channel_reason2str(int reason)
+@@ -2821,7 +2831,7 @@ char *ast_channel_reason2str(int reason)
}
}
@@ -138,7 +138,7 @@
{
int dummy_outstate;
int cause = 0;
-@@ -2813,7 +2823,7 @@ struct ast_channel *__ast_request_and_di
+@@ -2834,7 +2844,7 @@ struct ast_channel *__ast_request_and_di
else
outstate = &dummy_outstate; /* make outstate always a valid pointer */
@@ -147,7 +147,7 @@
if (!chan) {
ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
/* compute error and return */
-@@ -2836,7 +2846,7 @@ struct ast_channel *__ast_request_and_di
+@@ -2857,7 +2867,7 @@ struct ast_channel *__ast_request_and_di
ast_cdr_setaccount(chan, oh->account);
}
ast_set_callerid(chan, cid_num, cid_name, cid_num);
@@ -156,7 +156,7 @@
if (!chan->cdr) { /* up till now, this insertion hasn't been done. Therefore,
-@@ -2928,12 +2938,12 @@ struct ast_channel *__ast_request_and_di
+@@ -2950,12 +2960,12 @@ struct ast_channel *__ast_request_and_di
return chan;
}
@@ -172,7 +172,7 @@
{
struct chanlist *chan;
struct ast_channel *c;
-@@ -2983,6 +2993,11 @@ struct ast_channel *ast_request(const ch
+@@ -3005,6 +3015,11 @@ struct ast_channel *ast_request(const ch
return NULL;
}
@@ -184,7 +184,7 @@
int ast_call(struct ast_channel *chan, char *addr, int timeout)
{
/* Place an outgoing call, but don't wait any longer than timeout ms before returning.
-@@ -3368,7 +3383,7 @@ int ast_do_masquerade(struct ast_channel
+@@ -3390,7 +3405,7 @@ int ast_do_masquerade(struct ast_channel
ast_string_field_set(clone, name, masqn);
/* Notify any managers of the change, first the masq then the other */
@@ -226,7 +226,7 @@
*
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -4986,7 +4986,7 @@ static int ast_pbx_outgoing_cdr_failed(v
+@@ -4990,7 +4990,7 @@ static int ast_pbx_outgoing_cdr_failed(v
return 0; /* success */
}
@@ -235,7 +235,7 @@
{
struct ast_channel *chan;
struct async_stat *as;
-@@ -4996,7 +4996,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -5000,7 +5000,7 @@ int ast_pbx_outgoing_exten(const char *t
if (sync) {
LOAD_OH(oh);
@@ -244,7 +244,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5081,7 +5081,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -5092,7 +5092,7 @@ int ast_pbx_outgoing_exten(const char *t
res = -1;
goto outgoing_exten_cleanup;
}
@@ -253,7 +253,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5121,6 +5121,10 @@ outgoing_exten_cleanup:
+@@ -5132,6 +5132,10 @@ outgoing_exten_cleanup:
return res;
}
@@ -264,7 +264,7 @@
struct app_tmp {
char app[256];
char data[256];
-@@ -5145,7 +5149,7 @@ static void *ast_pbx_run_app(void *data)
+@@ -5156,7 +5160,7 @@ static void *ast_pbx_run_app(void *data)
return NULL;
}
@@ -273,7 +273,7 @@
{
struct ast_channel *chan;
struct app_tmp *tmp;
-@@ -5164,7 +5168,7 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5175,7 +5179,7 @@ int ast_pbx_outgoing_app(const char *typ
goto outgoing_app_cleanup;
}
if (sync) {
@@ -282,7 +282,7 @@
if (chan) {
if (!chan->cdr) { /* check if the channel already has a cdr record, if not give it one */
chan->cdr = ast_cdr_alloc(); /* allocate a cdr for the channel */
-@@ -5248,7 +5252,7 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5257,7 +5261,7 @@ int ast_pbx_outgoing_app(const char *typ
res = -1;
goto outgoing_app_cleanup;
}
@@ -291,7 +291,7 @@
if (!chan) {
free(as);
res = -1;
-@@ -5288,6 +5292,10 @@ outgoing_app_cleanup:
+@@ -5297,6 +5301,10 @@ outgoing_app_cleanup:
return res;
}
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Thu Apr 3 02:54:28 2008
@@ -1,6 +1,6 @@
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
-@@ -55,6 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -57,6 +57,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
static const char *tdesc = "Listen to a channel, and optionally whisper into it";
static const char *app_chan = "ChanSpy";
@@ -8,7 +8,7 @@
static const char *desc_chan =
" ChanSpy([chanprefix][|options]): This application is used to listen to the\n"
"audio from an Asterisk channel. This includes the audio coming in and\n"
-@@ -85,6 +86,27 @@ static const char *desc_chan =
+@@ -87,6 +88,27 @@ static const char *desc_chan =
" channel.\n"
;
@@ -46,7 +46,7 @@
{
struct ast_channel *this;
-@@ -353,6 +375,8 @@ static struct ast_channel *next_channel(
+@@ -466,6 +489,8 @@ redo:
this = ast_walk_channel_by_name_prefix_locked(last, spec, strlen(spec));
else if (exten)
this = ast_walk_channel_by_exten_locked(last, exten, context);
@@ -55,7 +55,7 @@
else
this = ast_channel_walk_locked(last);
-@@ -367,7 +391,7 @@ static struct ast_channel *next_channel(
+@@ -486,7 +511,7 @@ redo:
static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
int volfactor, const int fd, const char *mygroup, const char *spec,
@@ -78,7 +78,7 @@
const char *group;
int igrp = !mygroup;
char *groups[25];
-@@ -568,7 +592,7 @@ static int chanspy_exec(struct ast_chann
+@@ -737,7 +762,7 @@ static int chanspy_exec(struct ast_chann
}
}
@@ -87,7 +87,7 @@
if (fd)
close(fd);
-@@ -653,7 +677,92 @@ static int extenspy_exec(struct ast_chan
+@@ -822,7 +847,92 @@ static int extenspy_exec(struct ast_chan
}
}
@@ -181,7 +181,7 @@
if (fd)
close(fd);
-@@ -666,14 +775,15 @@ static int extenspy_exec(struct ast_chan
+@@ -835,14 +945,15 @@ static int extenspy_exec(struct ast_chan
return res;
}
@@ -198,7 +198,7 @@
return res;
}
-@@ -684,6 +794,7 @@ static int load_module(void)
+@@ -853,6 +964,7 @@ static int load_module(void)
res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan);
res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext);
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Thu Apr 3 02:54:28 2008
@@ -193,7 +193,7 @@
#include <unistd.h>
#ifdef POLLCOMPAT
#include "asterisk/poll-compat.h"
-@@ -1007,6 +1010,8 @@ int ast_waitfordigit_full(struct ast_cha
+@@ -1022,6 +1025,8 @@ int ast_waitfordigit_full(struct ast_cha
int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders);
int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders, int audiofd, int ctrlfd);
Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Apr 3 02:54:28 2008
@@ -1,6 +1,6 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -420,6 +420,7 @@ struct ast_channel {
+@@ -435,6 +435,7 @@ struct ast_channel {
unsigned int flags; /*!< channel flags of AST_FLAG_ type */
unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
AST_LIST_HEAD_NOLOCK(, ast_frame) readq;
@@ -99,7 +99,7 @@
unsigned int firstradio:1;
unsigned int hanguponpolarityswitch:1;
unsigned int hardwaredtmf:1;
-@@ -466,7 +480,8 @@ static struct zt_pvt {
+@@ -467,7 +481,8 @@ static struct zt_pvt {
unsigned int overlapdial:1;
unsigned int permcallwaiting:1;
unsigned int permhidecallerid:1; /*!< Whether to hide our outgoing caller ID or not */
@@ -109,7 +109,7 @@
unsigned int priexclusive:1;
unsigned int pulse:1;
unsigned int pulsedial:1; /*!< whether a pulse dial phone is detected */
-@@ -503,6 +518,7 @@ static struct zt_pvt {
+@@ -504,6 +519,7 @@ static struct zt_pvt {
#endif
char cid_num[AST_MAX_EXTENSION];
int cid_ton; /*!< Type Of Number (TON) */
@@ -117,7 +117,7 @@
char cid_name[AST_MAX_EXTENSION];
char lastcid_num[AST_MAX_EXTENSION];
char lastcid_name[AST_MAX_EXTENSION];
-@@ -568,6 +584,8 @@ static struct zt_pvt {
+@@ -569,6 +585,8 @@ static struct zt_pvt {
struct zt_pvt *bearer;
struct zt_pvt *realcall;
q931_call *call;
@@ -126,7 +126,7 @@
int prioffset;
int logicalspan;
#endif
-@@ -613,11 +631,14 @@ static struct zt_chan_conf zt_chan_conf_
+@@ -614,11 +632,14 @@ static struct zt_chan_conf zt_chan_conf_
.minunused = 2,
.idleext = "",
.idledial = "",
@@ -141,7 +141,7 @@
.resetinterval = 3600
},
-@@ -629,6 +650,8 @@ static struct zt_chan_conf zt_chan_conf_
+@@ -630,6 +651,8 @@ static struct zt_chan_conf zt_chan_conf_
.mohinterpret = "default",
.mohsuggest = "",
.transfertobusy = 1,
@@ -150,7 +150,7 @@
.cid_signalling = CID_SIG_BELL,
.cid_start = CID_START_RING,
-@@ -683,6 +706,8 @@ static int zt_indicate(struct ast_channe
+@@ -684,6 +707,8 @@ static int zt_indicate(struct ast_channe
static int zt_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
static int zt_setoption(struct ast_channel *chan, int option, void *data, int datalen);
static int zt_func_read(struct ast_channel *chan, char *function, char *data, char *buf, size_t len);
@@ -159,7 +159,7 @@
static const struct ast_channel_tech zap_tech = {
.type = "Zap",
-@@ -714,6 +739,13 @@ static const struct ast_channel_tech zap
+@@ -715,6 +740,13 @@ static const struct ast_channel_tech zap
struct zt_pvt *round_robin[32];
#ifdef HAVE_PRI
@@ -173,7 +173,7 @@
static inline int pri_grab(struct zt_pvt *pvt, struct zt_pri *pri)
{
int res;
-@@ -1416,12 +1448,16 @@ static void zt_enable_ec(struct zt_pvt *
+@@ -1417,12 +1449,16 @@ static void zt_enable_ec(struct zt_pvt *
int res;
if (!p)
return;
@@ -191,7 +191,7 @@
return;
}
if (p->echocancel) {
-@@ -1448,7 +1484,7 @@ static void zt_train_ec(struct zt_pvt *p
+@@ -1449,7 +1485,7 @@ static void zt_train_ec(struct zt_pvt *p
{
int x;
int res;
@@ -200,7 +200,7 @@
x = p->echotraining;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_ECHOTRAIN, &x);
if (res)
-@@ -1809,7 +1845,12 @@ static int zt_call(struct ast_channel *a
+@@ -1810,7 +1846,12 @@ static int zt_call(struct ast_channel *a
ast_log(LOG_WARNING, "Unable to flush input on channel %d\n", p->channel);
p->outgoing = 1;
@@ -214,7 +214,7 @@
mysig = p->sig;
if (p->outsigmod > -1)
-@@ -2040,6 +2081,7 @@ static int zt_call(struct ast_channel *a
+@@ -2041,6 +2082,7 @@ static int zt_call(struct ast_channel *a
case SIG_PRI:
/* We'll get it in a moment -- but use dialdest to store pre-setup_ack digits */
p->dialdest[0] = '\0';
@@ -222,7 +222,7 @@
break;
default:
ast_log(LOG_DEBUG, "not yet implemented\n");
-@@ -2060,6 +2102,12 @@ static int zt_call(struct ast_channel *a
+@@ -2061,6 +2103,12 @@ static int zt_call(struct ast_channel *a
const char *rr_str;
int redirect_reason;
@@ -235,7 +235,7 @@
c = strchr(dest, '/');
if (c)
c++;
-@@ -2082,6 +2130,7 @@ static int zt_call(struct ast_channel *a
+@@ -2083,6 +2131,7 @@ static int zt_call(struct ast_channel *a
ast_mutex_unlock(&p->lock);
return -1;
}
@@ -243,7 +243,7 @@
if (mysig != SIG_FXSKS) {
p->dop.op = ZT_DIAL_OP_REPLACE;
s = strchr(c + p->stripmsd, 'w');
-@@ -2105,6 +2154,8 @@ static int zt_call(struct ast_channel *a
+@@ -2106,6 +2155,8 @@ static int zt_call(struct ast_channel *a
pri_rel(p->pri);
ast_mutex_unlock(&p->lock);
return -1;
@@ -252,7 +252,7 @@
}
if (!(sr = pri_sr_new())) {
ast_log(LOG_WARNING, "Failed to allocate setup request channel %d\n", p->channel);
-@@ -2134,7 +2185,7 @@ static int zt_call(struct ast_channel *a
+@@ -2135,7 +2186,7 @@ static int zt_call(struct ast_channel *a
pri_sr_set_channel(sr, p->bearer ? PVT_TO_CHANNEL(p->bearer) : PVT_TO_CHANNEL(p), exclusive, 1);
pri_sr_set_bearer(sr, p->digital ? PRI_TRANS_CAP_DIGITAL : ast->transfercapability,
(p->digital ? -1 :
@@ -261,7 +261,7 @@
if (p->pri->facilityenable)
pri_facility_enable(p->pri->pri);
-@@ -2398,8 +2449,10 @@ static int pri_find_dchan(struct zt_pri
+@@ -2399,8 +2450,10 @@ static int pri_find_dchan(struct zt_pri
}
if (newslot < 0) {
newslot = 0;
@@ -273,7 +273,7 @@
}
if (old && (oldslot != newslot))
ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n",
-@@ -2409,6 +2462,16 @@ static int pri_find_dchan(struct zt_pri
+@@ -2410,6 +2463,16 @@ static int pri_find_dchan(struct zt_pri
}
#endif
@@ -290,7 +290,7 @@
static int zt_hangup(struct ast_channel *ast)
{
int res;
-@@ -2456,8 +2519,7 @@ static int zt_hangup(struct ast_channel
+@@ -2457,8 +2520,7 @@ static int zt_hangup(struct ast_channel
if (option_debug)
ast_log(LOG_DEBUG, "Hangup: channel: %d index = %d, normal = %d, callwait = %d, thirdcall = %d\n",
p->channel, index, p->subs[SUB_REAL].zfd, p->subs[SUB_CALLWAIT].zfd, p->subs[SUB_THREEWAY].zfd);
@@ -300,7 +300,7 @@
if (index > -1) {
/* Real channel, do some fixup */
p->subs[index].owner = NULL;
-@@ -2559,6 +2621,7 @@ static int zt_hangup(struct ast_channel
+@@ -2560,6 +2622,7 @@ static int zt_hangup(struct ast_channel
}
if (!p->subs[SUB_REAL].owner && !p->subs[SUB_CALLWAIT].owner && !p->subs[SUB_THREEWAY].owner) {
@@ -308,7 +308,7 @@
p->owner = NULL;
p->ringt = 0;
p->distinctivering = 0;
-@@ -2601,7 +2664,7 @@ static int zt_hangup(struct ast_channel
+@@ -2602,7 +2665,7 @@ static int zt_hangup(struct ast_channel
pri_call_set_useruser(p->call, useruser);
#endif
@@ -317,7 +317,7 @@
p->call = NULL;
if (p->bearer)
p->bearer->call = NULL;
-@@ -2621,7 +2684,28 @@ static int zt_hangup(struct ast_channel
+@@ -2622,7 +2685,28 @@ static int zt_hangup(struct ast_channel
if (atoi(cause))
icause = atoi(cause);
}
@@ -347,7 +347,7 @@
}
if (res < 0)
ast_log(LOG_WARNING, "pri_disconnect failed\n");
-@@ -2805,10 +2889,14 @@ static int zt_answer(struct ast_channel
+@@ -2806,10 +2890,14 @@ static int zt_answer(struct ast_channel
p->proceeding = 1;
res = pri_answer(p->pri->pri, p->call, 0, !p->digital);
pri_rel(p->pri);
@@ -362,7 +362,7 @@
break;
#endif
case 0:
-@@ -3445,6 +3533,15 @@ static int zt_fixup(struct ast_channel *
+@@ -3446,6 +3534,15 @@ static int zt_fixup(struct ast_channel *
{
struct zt_pvt *p = newchan->tech_pvt;
int x;
@@ -378,7 +378,7 @@
ast_mutex_lock(&p->lock);
ast_log(LOG_DEBUG, "New owner for channel %d is %s\n", p->channel, newchan->name);
if (p->owner == oldchan) {
-@@ -3654,8 +3751,10 @@ static void zt_handle_dtmfup(struct ast_
+@@ -3655,8 +3752,10 @@ static void zt_handle_dtmfup(struct ast_
pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast->exten);
if (ast_async_goto(ast, target_context, "fax", 1))
ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, target_context);
@@ -390,7 +390,7 @@
} else if (option_debug)
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
} else if (option_debug)
-@@ -3814,7 +3913,7 @@ static struct ast_frame *zt_handle_event
+@@ -3815,7 +3914,7 @@ static struct ast_frame *zt_handle_event
if (p->call) {
if (p->pri && p->pri->pri) {
if (!pri_grab(p, p->pri)) {
@@ -399,7 +399,7 @@
pri_destroycall(p->pri->pri, p->call);
p->call = NULL;
pri_rel(p->pri);
-@@ -4865,7 +4964,7 @@ static struct ast_frame *zt_read(struct
+@@ -4884,7 +4983,7 @@ static struct ast_frame *zt_read(struct
p->subs[index].f.data = NULL;
p->subs[index].f.datalen= 0;
}
@@ -408,7 +408,7 @@
/* Perform busy detection. etc on the zap line */
f = ast_dsp_process(ast, p->dsp, &p->subs[index].f);
if (f) {
-@@ -4877,8 +4976,9 @@ static struct ast_frame *zt_read(struct
+@@ -4896,8 +4995,9 @@ static struct ast_frame *zt_read(struct
}
} else if (f->frametype == AST_FRAME_DTMF) {
#ifdef HAVE_PRI
@@ -420,7 +420,7 @@
f->frametype = AST_FRAME_NULL;
f->subclass = 0;
}
-@@ -4953,7 +5053,9 @@ static int zt_write(struct ast_channel *
+@@ -4972,7 +5072,9 @@ static int zt_write(struct ast_channel *
#endif
/* Write a frame of (presumably voice) data */
if (frame->frametype != AST_FRAME_VOICE) {
@@ -431,7 +431,7 @@
ast_log(LOG_WARNING, "Don't know what to do with frame type '%d'\n", frame->frametype);
return 0;
}
-@@ -5021,7 +5123,7 @@ static int zt_indicate(struct ast_channe
+@@ -5040,7 +5142,7 @@ static int zt_indicate(struct ast_channe
switch (condition) {
case AST_CONTROL_BUSY:
#ifdef HAVE_PRI
@@ -440,7 +440,7 @@
chan->hangupcause = AST_CAUSE_USER_BUSY;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5103,7 +5205,7 @@ static int zt_indicate(struct ast_channe
+@@ -5122,7 +5224,7 @@ static int zt_indicate(struct ast_channe
case AST_CONTROL_CONGESTION:
chan->hangupcause = AST_CAUSE_CONGESTION;
#ifdef HAVE_PRI
@@ -449,7 +449,7 @@
chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5297,8 +5399,12 @@ static struct ast_channel *zt_new(struct
+@@ -5319,8 +5421,12 @@ static struct ast_channel *zt_new(struct
if (state == AST_STATE_RING)
tmp->rings = 1;
tmp->tech_pvt = i;
@@ -463,7 +463,7 @@
tmp->callgroup = i->callgroup;
tmp->pickupgroup = i->pickupgroup;
}
-@@ -5428,6 +5534,7 @@ static void *ss_thread(void *data)
+@@ -5450,6 +5556,7 @@ static void *ss_thread(void *data)
int len = 0;
int res;
int index;
@@ -471,7 +471,7 @@
/* in the bizarre case where the channel has become a zombie before we
even get started here, abort safely
-@@ -5456,10 +5563,17 @@ static void *ss_thread(void *data)
+@@ -5478,10 +5585,17 @@ static void *ss_thread(void *data)
len = strlen(exten);
res = 0;
while ((len < AST_MAX_EXTENSION-1) && ast_matchmore_extension(chan, chan->context, exten, 1, p->cid_num)) {
@@ -534,7 +534,7 @@
break;
default:
ast_log(LOG_WARNING, "Don't know how to handle on hook with signalling %s on channel %d\n", sig2str(i->sig), i->channel);
-@@ -7030,6 +7172,8 @@ static int pri_resolve_span(int *span, i
+@@ -7063,6 +7194,8 @@ static int pri_resolve_span(int *span, i
} else {
if (si->totalchans == 31) { /* if it's an E1 */
pris[*span].dchannels[0] = 16 + offset;
@@ -543,7 +543,7 @@
} else {
pris[*span].dchannels[0] = 24 + offset;
}
-@@ -7282,6 +7426,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7315,6 +7448,11 @@ static struct zt_pvt *mkintf(int channel
destroy_zt_pvt(&tmp);
return NULL;
}
@@ -555,7 +555,7 @@
if (pris[span].minunused && (pris[span].minunused != conf.pri.minunused)) {
ast_log(LOG_ERROR, "Span %d already has minunused of %d.\n", span + 1, conf.pri.minunused);
destroy_zt_pvt(&tmp);
-@@ -7299,6 +7448,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7332,6 +7470,11 @@ static struct zt_pvt *mkintf(int channel
return NULL;
}
pris[span].nodetype = conf.pri.nodetype;
@@ -567,7 +567,7 @@
pris[span].switchtype = myswitchtype;
pris[span].nsf = conf.pri.nsf;
pris[span].dialplan = conf.pri.dialplan;
-@@ -7307,9 +7461,13 @@ static struct zt_pvt *mkintf(int channel
+@@ -7340,9 +7483,13 @@ static struct zt_pvt *mkintf(int channel
pris[span].minunused = conf.pri.minunused;
pris[span].minidle = conf.pri.minidle;
pris[span].overlapdial = conf.pri.overlapdial;
@@ -581,7 +581,7 @@
ast_copy_string(pris[span].internationalprefix, conf.pri.internationalprefix, sizeof(pris[span].internationalprefix));
ast_copy_string(pris[span].nationalprefix, conf.pri.nationalprefix, sizeof(pris[span].nationalprefix));
ast_copy_string(pris[span].localprefix, conf.pri.localprefix, sizeof(pris[span].localprefix));
-@@ -7445,6 +7603,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7484,6 +7631,7 @@ static struct zt_pvt *mkintf(int channel
tmp->restrictcid = conf.chan.restrictcid;
tmp->use_callingpres = conf.chan.use_callingpres;
tmp->priindication_oob = conf.chan.priindication_oob;
@@ -589,7 +589,7 @@
tmp->priexclusive = conf.chan.priexclusive;
if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) {
-@@ -7724,7 +7883,7 @@ static int pri_find_empty_chan(struct zt
+@@ -7766,7 +7914,7 @@ static int pri_find_empty_chan(struct zt
break;
if (!backwards && (x >= pri->numchans))
break;
@@ -598,7 +598,7 @@
ast_log(LOG_DEBUG, "Found empty available channel %d/%d\n",
pri->pvts[x]->logicalspan, pri->pvts[x]->prioffset);
return x;
-@@ -7920,6 +8079,11 @@ static struct ast_channel *zt_request(co
+@@ -7962,6 +8110,11 @@ static struct ast_channel *zt_request(co
p->digital = 1;
if (tmp)
tmp->transfercapability = AST_TRANS_CAP_DIGITAL;
@@ -610,7 +610,7 @@
} else {
ast_log(LOG_WARNING, "Unknown option '%c' in '%s'\n", opt, (char *)data);
}
-@@ -7953,13 +8117,14 @@ next:
+@@ -7995,13 +8148,14 @@ next:
*cause = AST_CAUSE_BUSY;
} else if (groupmatched) {
*cause = AST_CAUSE_CONGESTION;
@@ -626,7 +626,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8004,7 +8169,9 @@ static int pri_find_principle(struct zt_
+@@ -8046,7 +8200,9 @@ static int pri_find_principle(struct zt_
static int pri_fixup_principle(struct zt_pri *pri, int principle, q931_call *c)
{
int x;
@@ -694,7 +694,7 @@
return -1;
}
-@@ -8133,86 +8338,21 @@ static void *do_idle_thread(void *vchan)
+@@ -8182,86 +8373,21 @@ static void *do_idle_thread(void *vchan)
#ifndef PRI_RESTART
#error "Upgrade your libpri"
#endif
@@ -788,7 +788,7 @@
do {
pri->resetpos++;
} while ((pri->resetpos < pri->numchans) &&
-@@ -8296,13 +8436,30 @@ static void apply_plan_to_number(char *b
+@@ -8345,13 +8471,30 @@ static void apply_plan_to_number(char *b
}
}
@@ -826,7 +826,7 @@
}
static void *pri_dchannel(void *vpri)
-@@ -8482,15 +8639,44 @@ static void *pri_dchannel(void *vpri)
+@@ -8531,15 +8674,44 @@ static void *pri_dchannel(void *vpri)
/* Check for an event */
x = 0;
res = ioctl(pri->fds[which], ZT_GETEVENT, &x);
@@ -874,7 +874,7 @@
}
if (option_debug)
-@@ -8502,24 +8674,33 @@ static void *pri_dchannel(void *vpri)
+@@ -8551,24 +8723,33 @@ static void *pri_dchannel(void *vpri)
break;
}
} else if (errno != EINTR)
@@ -915,7 +915,7 @@
}
if ((e->e != PRI_EVENT_DCHAN_UP) && (e->e != PRI_EVENT_DCHAN_DOWN) && (pri->pri != pri->dchans[which]))
-@@ -8516,24 +8687,63 @@ static void *pri_dchannel(void *vpri)
+@@ -8579,24 +8760,63 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_DCHAN_UP:
if (!pri->pri) pri_find_dchan(pri);
@@ -989,7 +989,7 @@
pri->resetting = 0;
/* Hangup active channels and put them in alarm mode */
for (i = 0; i < pri->numchans; i++) {
-@@ -8551,12 +8790,13 @@ static void *pri_dchannel(void *vpri)
+@@ -8606,12 +8826,13 @@ static void *pri_dchannel(void *vpri)
/* T309 is not enabled : hangup calls when alarm occurs */
if (p->call) {
if (p->pri && p->pri->pri) {
@@ -1004,7 +1004,7 @@
if (p->realcall) {
pri_hangup_all(p->realcall, pri);
} else if (p->owner)
-@@ -8565,6 +8805,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8620,6 +8841,7 @@ static void *pri_dchannel(void *vpri)
p->inalarm = 1;
}
}
@@ -1012,7 +1012,7 @@
}
break;
case PRI_EVENT_RESTART:
-@@ -8599,8 +8840,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8654,8 +8876,8 @@ static void *pri_dchannel(void *vpri)
pri_destroycall(pri->pri, pri->pvts[x]->call);
pri->pvts[x]->call = NULL;
}
@@ -1023,7 +1023,7 @@
else if (pri->pvts[x]->owner)
pri->pvts[x]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_mutex_unlock(&pri->pvts[x]->lock);
-@@ -8634,7 +8875,6 @@ static void *pri_dchannel(void *vpri)
+@@ -8689,7 +8911,6 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -1031,7 +1031,7 @@
case PRI_EVENT_INFO_RECEIVED:
chanpos = pri_find_principle(pri, e->ring.channel);
if (chanpos < 0) {
-@@ -8643,9 +8883,11 @@ static void *pri_dchannel(void *vpri)
+@@ -8698,9 +8919,11 @@ static void *pri_dchannel(void *vpri)
} else {
chanpos = pri_fixup_principle(pri, chanpos, e->ring.call);
if (chanpos > -1) {
@@ -1044,7 +1044,7 @@
/* how to do that */
int digitlen = strlen(e->ring.callednum);
char digit;
-@@ -8657,6 +8899,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8712,6 +8935,14 @@ static void *pri_dchannel(void *vpri)
zap_queue_frame(pri->pvts[chanpos], &f, pri);
}
}
@@ -1059,7 +1059,7 @@
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
-@@ -8664,36 +8914,59 @@ static void *pri_dchannel(void *vpri)
+@@ -8719,36 +8950,59 @@ static void *pri_dchannel(void *vpri)
break;
case PRI_EVENT_RING:
crv = NULL;
@@ -1135,7 +1135,7 @@
if (pri->switchtype == PRI_SWITCH_GR303_TMC) {
/* Should be safe to lock CRV AFAIK while bearer is still locked */
crv = pri_find_crv(pri, pri_get_crv(pri->pri, e->ring.call, NULL));
-@@ -8707,13 +8980,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8762,13 +9016,14 @@ static void *pri_dchannel(void *vpri)
ast_log(LOG_WARNING, "Call received for busy CRV %d on span %d\n", pri_get_crv(pri->pri, e->ring.call, NULL), pri->span);
} else
ast_log(LOG_NOTICE, "Call received for unconfigured CRV %d on span %d\n", pri_get_crv(pri->pri, e->ring.call, NULL), pri->span);
@@ -1151,7 +1151,7 @@
pri->pvts[chanpos]->call = e->ring.call;
apply_plan_to_number(plancallingnum, sizeof(plancallingnum), pri, e->ring.callingnum, e->ring.callingplan);
if (pri->pvts[chanpos]->use_callerid) {
-@@ -8738,34 +9012,82 @@ static void *pri_dchannel(void *vpri)
+@@ -8793,34 +9048,82 @@ static void *pri_dchannel(void *vpri)
}
apply_plan_to_number(pri->pvts[chanpos]->rdnis, sizeof(pri->pvts[chanpos]->rdnis), pri,
e->ring.redirectingnum, e->ring.callingplanrdnis);
@@ -1252,7 +1252,7 @@
/* Make sure extension exists (or in overlap dial mode, can exist) */
if ((pri->overlapdial && ast_canmatch_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) ||
ast_exists_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) {
-@@ -8784,19 +9106,36 @@ static void *pri_dchannel(void *vpri)
+@@ -8839,19 +9142,36 @@ static void *pri_dchannel(void *vpri)
res = zt_setlaw(pri->pvts[chanpos]->subs[SUB_REAL].zfd, law);
if (res < 0)
ast_log(LOG_WARNING, "Unable to set law on channel %d\n", pri->pvts[chanpos]->channel);
@@ -1292,7 +1292,7 @@
/* Get the use_callingpres state */
pri->pvts[chanpos]->callingpres = e->ring.callingpres;
-@@ -8808,10 +9147,17 @@ static void *pri_dchannel(void *vpri)
+@@ -8863,10 +9183,17 @@ static void *pri_dchannel(void *vpri)
/* Set bearer and such */
pri_assign_bearer(crv, pri, pri->pvts[chanpos]);
c = zt_new(crv, AST_STATE_RESERVED, 0, SUB_REAL, law, e->ring.ctype);
@@ -1310,7 +1310,7 @@
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
-@@ -8819,6 +9165,16 @@ static void *pri_dchannel(void *vpri)
+@@ -8874,6 +9201,16 @@ static void *pri_dchannel(void *vpri)
if (!ast_strlen_zero(e->ring.callingsubaddr)) {
pbx_builtin_setvar_helper(c, "CALLINGSUBADDR", e->ring.callingsubaddr);
}
@@ -1327,7 +1327,7 @@
if (e->ring.ani2 >= 0) {
snprintf(ani2str, 5, "%.2d", e->ring.ani2);
pbx_builtin_setvar_helper(c, "ANI2", ani2str);
-@@ -8842,8 +9198,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8897,8 +9234,8 @@ static void *pri_dchannel(void *vpri)
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (c && !ast_pthread_create(&threadid, &attr, ss_thread, c)) {
if (option_verbose > 2)
@@ -1338,7 +1338,7 @@
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span);
} else {
ast_log(LOG_WARNING, "Unable to start PBX on channel %d/%d, span %d\n",
-@@ -8851,15 +9207,19 @@ static void *pri_dchannel(void *vpri)
+@@ -8906,15 +9243,19 @@ static void *pri_dchannel(void *vpri)
if (c)
ast_hangup(c);
else {
@@ -1359,7 +1359,7 @@
if (c) {
char calledtonstr[10];
-@@ -8886,26 +9246,43 @@ static void *pri_dchannel(void *vpri)
+@@ -8941,26 +9282,43 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->lock);
if (option_verbose > 2)
@@ -1407,7 +1407,7 @@
pri->pvts[chanpos]->call = NULL;
pri->pvts[chanpos]->exten[0] = '\0';
}
-@@ -8914,9 +9291,9 @@ static void *pri_dchannel(void *vpri)
+@@ -8969,9 +9327,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
if (e->ring.flexible)
@@ -1419,7 +1419,7 @@
}
break;
case PRI_EVENT_RINGING:
-@@ -8932,7 +9309,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8987,7 +9345,7 @@ static void *pri_dchannel(void *vpri)
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
if (ast_strlen_zero(pri->pvts[chanpos]->dop.dialstr)) {
@@ -1428,7 +1428,7 @@
pri->pvts[chanpos]->subs[SUB_REAL].needringing = 1;
pri->pvts[chanpos]->alerting = 1;
} else
-@@ -8964,9 +9341,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9019,9 +9377,16 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_PROGRESS:
@@ -1446,7 +1446,7 @@
#ifdef PRI_PROGRESS_MASK
if ((!pri->pvts[chanpos]->progress) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
#else
-@@ -9008,11 +9392,18 @@ static void *pri_dchannel(void *vpri)
+@@ -9063,11 +9428,18 @@ static void *pri_dchannel(void *vpri)
pri->pvts[chanpos]->progress = 1;
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
@@ -1465,7 +1465,7 @@
if (!pri->pvts[chanpos]->proceeding) {
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
-@@ -9037,6 +9428,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9092,6 +9464,7 @@ static void *pri_dchannel(void *vpri)
pri->pvts[chanpos]->proceeding = 1;
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
@@ -1473,7 +1473,7 @@
}
break;
case PRI_EVENT_FACNAME:
-@@ -9060,6 +9452,163 @@ static void *pri_dchannel(void *vpri)
+@@ -9115,6 +9488,163 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -1637,7 +1637,7 @@
case PRI_EVENT_ANSWER:
chanpos = pri_find_principle(pri, e->answer.channel);
if (chanpos < 0) {
-@@ -9072,6 +9621,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9127,6 +9657,7 @@ static void *pri_dchannel(void *vpri)
PRI_SPAN(e->answer.channel), PRI_CHANNEL(e->answer.channel), pri->span);
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
@@ -1645,7 +1645,7 @@
/* Now we can do call progress detection */
/* We changed this so it turns on the DSP no matter what... progress or no progress.
-@@ -9101,11 +9651,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9156,11 +9687,16 @@ static void *pri_dchannel(void *vpri)
ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", pri->pvts[chanpos]->dop.dialstr);
pri->pvts[chanpos]->dop.dialstr[0] = '\0';
} else if (pri->pvts[chanpos]->confirmanswer) {
@@ -1663,7 +1663,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9162,20 +9717,29 @@ static void *pri_dchannel(void *vpri)
+@@ -9217,20 +9753,29 @@ static void *pri_dchannel(void *vpri)
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup, cause %d\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, e->hangup.cause);
} else {
@@ -1700,7 +1700,7 @@
#ifdef SUPPORT_USERUSER
if (pri->pvts[chanpos]->owner && !ast_strlen_zero(e->hangup.useruserinfo)) {
-@@ -9188,8 +9752,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9243,8 +9788,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1712,7 +1712,7 @@
}
}
break;
-@@ -9199,15 +9764,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9254,15 +9800,23 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_HANGUP_REQ:
chanpos = pri_find_principle(pri, e->hangup.channel);
if (chanpos < 0) {
@@ -1739,7 +1739,7 @@
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP)
pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-@@ -9234,16 +9807,34 @@ static void *pri_dchannel(void *vpri)
+@@ -9289,16 +9843,34 @@ static void *pri_dchannel(void *vpri)
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s");
@@ -1778,7 +1778,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9257,9 +9848,27 @@ static void *pri_dchannel(void *vpri)
+@@ -9312,9 +9884,27 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1807,7 +1807,7 @@
break;
case PRI_EVENT_HANGUP_ACK:
chanpos = pri_find_principle(pri, e->hangup.channel);
-@@ -9271,6 +9880,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9326,6 +9916,7 @@ static void *pri_dchannel(void *vpri)
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
pri->pvts[chanpos]->call = NULL;
@@ -1815,7 +1815,7 @@
pri->pvts[chanpos]->resetting = 0;
if (pri->pvts[chanpos]->owner) {
if (option_verbose > 2)
-@@ -9377,10 +9987,22 @@ static void *pri_dchannel(void *vpri)
+@@ -9432,10 +10023,22 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->pvts[chanpos]->lock);
switch (e->notify.info) {
case PRI_NOTIFY_REMOTE_HOLD:
@@ -1838,7 +1838,7 @@
f.subclass = AST_CONTROL_UNHOLD;
zap_queue_frame(pri->pvts[chanpos], &f, pri);
break;
-@@ -9388,6 +10010,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9443,6 +10046,23 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
break;
@@ -1862,7 +1862,7 @@
default:
ast_log(LOG_DEBUG, "Event: %d\n", e->e);
}
-@@ -9449,7 +10088,7 @@ static int start_pri(struct zt_pri *pri)
+@@ -9504,7 +10124,7 @@ static int start_pri(struct zt_pri *pri)
pri->fds[i] = -1;
return -1;
}
@@ -1871,7 +1871,7 @@
/* Force overlap dial if we're doing GR-303! */
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial = 1;
-@@ -9517,39 +10156,77 @@ static char *complete_span_5(const char
+@@ -9572,39 +10192,77 @@ static char *complete_span_5(const char
static int handle_pri_set_debug_file(int fd, int argc, char **argv)
{
@@ -1967,7 +1967,7 @@
}
return RESULT_SUCCESS;
-@@ -9583,6 +10260,7 @@ static int handle_pri_debug(int fd, int
+@@ -9638,6 +10296,7 @@ static int handle_pri_debug(int fd, int
@@ -1975,7 +1975,7 @@
static int handle_pri_no_debug(int fd, int argc, char *argv[])
{
int span;
-@@ -9732,10 +10410,6 @@ static int handle_pri_show_debug(int fd,
+@@ -9787,10 +10446,6 @@ static int handle_pri_show_debug(int fd,
}
}
@@ -1986,7 +1986,7 @@
if (!count)
ast_cli(fd, "No debug set or no PRI running\n");
-@@ -9762,6 +10436,18 @@ static const char pri_show_spans_help[]
+@@ -9817,6 +10472,18 @@ static const char pri_show_spans_help[]
"Usage: pri show spans\n"
" Displays PRI Information\n";
@@ -2005,7 +2005,7 @@
static struct ast_cli_entry zap_pri_cli[] = {
{ { "pri", "debug", "span", NULL },
handle_pri_debug, "Enables PRI debugging on a span",
-@@ -9786,6 +10472,15 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9841,6 +10508,15 @@ static struct ast_cli_entry zap_pri_cli[
{ { "pri", "show", "debug", NULL },
handle_pri_show_debug, "Displays current PRI debug settings" },
@@ -2021,7 +2021,7 @@
{ { "pri", "set", "debug", "file", NULL },
handle_pri_set_debug_file, "Sends PRI debug output to the specified file" },
-@@ -9793,8 +10488,76 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9848,8 +10524,76 @@ static struct ast_cli_entry zap_pri_cli[
handle_pri_set_debug_file, "Ends PRI debug output to file" },
};
@@ -2098,7 +2098,7 @@
static int zap_destroy_channel(int fd, int argc, char **argv)
{
int channel;
-@@ -10375,8 +11138,11 @@ static int __unload_module(void)
+@@ -10430,8 +11174,11 @@ static int __unload_module(void)
}
ast_cli_unregister_multiple(zap_pri_cli, sizeof(zap_pri_cli) / sizeof(struct ast_cli_entry));
ast_unregister_application(zap_send_keypad_facility_app);
@@ -2110,7 +2110,7 @@
ast_manager_unregister( "ZapDialOffhook" );
ast_manager_unregister( "ZapHangup" );
ast_manager_unregister( "ZapTransfer" );
-@@ -10878,6 +11644,22 @@ static int process_zap(struct zt_chan_co
+@@ -10933,6 +11680,22 @@ static int process_zap(struct zt_chan_co
confp->chan.sig = SIG_GR303FXSKS;
confp->chan.radio = 0;
confp->pri.nodetype = PRI_CPE;
@@ -2133,7 +2133,7 @@
#endif
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
-@@ -10990,9 +11772,21 @@ static int process_zap(struct zt_chan_co
+@@ -11045,9 +11808,21 @@ static int process_zap(struct zt_chan_co
confp->chan.priindication_oob = 1;
else if (!strcasecmp(v->value, "inband"))
confp->chan.priindication_oob = 0;
@@ -2156,7 +2156,7 @@
} else if (!strcasecmp(v->name, "priexclusive")) {
confp->chan.priexclusive = ast_true(v->value);
} else if (!strcasecmp(v->name, "internationalprefix")) {
-@@ -11005,6 +11799,10 @@ static int process_zap(struct zt_chan_co
+@@ -11060,6 +11835,10 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.privateprefix, v->value, sizeof(confp->pri.privateprefix));
} else if (!strcasecmp(v->name, "unknownprefix")) {
ast_copy_string(confp->pri.unknownprefix, v->value, sizeof(confp->pri.unknownprefix));
@@ -2167,7 +2167,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -11021,6 +11819,8 @@ static int process_zap(struct zt_chan_co
+@@ -11076,6 +11855,8 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.idleext, v->value, sizeof(confp->pri.idleext));
} else if (!strcasecmp(v->name, "idledial")) {
ast_copy_string(confp->pri.idledial, v->value, sizeof(confp->pri.idledial));
@@ -2176,7 +2176,7 @@
} else if (!strcasecmp(v->name, "overlapdial")) {
confp->pri.overlapdial = ast_true(v->value);
} else if (!strcasecmp(v->name, "pritimer")) {
-@@ -11322,6 +12122,7 @@ static int setup_zap(int reload)
+@@ -11377,6 +12158,7 @@ static int setup_zap(int reload)
#ifdef HAVE_PRI
if (!reload) {
for (x = 0; x < NUM_SPANS; x++) {
@@ -2184,7 +2184,7 @@
if (pris[x].pvts[0]) {
if (start_pri(pris + x)) {
ast_log(LOG_ERROR, "Unable to start D-channel on span %d\n", x + 1);
-@@ -11369,7 +12170,10 @@ static int load_module(void)
+@@ -11424,7 +12206,10 @@ static int load_module(void)
ast_string_field_init(&inuse, 16);
ast_string_field_set(&inuse, name, "GR-303InUse");
ast_cli_register_multiple(zap_pri_cli, sizeof(zap_pri_cli) / sizeof(struct ast_cli_entry));
@@ -2195,7 +2195,7 @@
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
memset(round_robin, 0, sizeof(round_robin));
-@@ -11403,6 +12207,7 @@ static int zt_sendtext(struct ast_channe
+@@ -11458,6 +12243,7 @@ static int zt_sendtext(struct ast_channe
float scont = 0.0;
int index;
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Thu Apr 3 02:54:28 2008
@@ -64,7 +64,7 @@
static struct zt_distRings drings;
struct distRingData {
-@@ -603,6 +623,9 @@ static struct zt_pvt {
+@@ -604,6 +624,9 @@ static struct zt_pvt {
int prioffset;
int logicalspan;
#endif
@@ -74,7 +74,7 @@
int polarity;
int dsp_features;
char begindigit;
-@@ -709,7 +732,7 @@ static struct zt_chan_conf zt_chan_conf_
+@@ -710,7 +733,7 @@ static struct zt_chan_conf zt_chan_conf_
static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause);
static int zt_digit_begin(struct ast_channel *ast, char digit);
static int zt_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
@@ -83,7 +83,7 @@
static int zt_call(struct ast_channel *ast, char *rdest, int timeout);
static int zt_hangup(struct ast_channel *ast);
static int zt_answer(struct ast_channel *ast);
-@@ -1261,6 +1284,8 @@ static char *zap_sig2str(int sig)
+@@ -1262,6 +1285,8 @@ static char *zap_sig2str(int sig)
return "GR-303 with FXOKS";
case SIG_GR303FXSKS:
return "GR-303 with FXSKS";
@@ -92,7 +92,7 @@
case 0:
return "Pseudo";
default:
-@@ -1682,7 +1707,7 @@ static inline int zt_confmute(struct zt_
+@@ -1683,7 +1708,7 @@ static inline int zt_confmute(struct zt_
{
int x, y, res;
x = muted;
@@ -101,7 +101,7 @@
y = 1;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &y);
if (res)
-@@ -2097,6 +2122,25 @@ static int zt_call(struct ast_channel *a
+@@ -2098,6 +2123,25 @@ static int zt_call(struct ast_channel *a
p->dialdest[0] = '\0';
disable_dtmf_detect(p);
break;
@@ -127,7 +127,7 @@
default:
ast_log(LOG_DEBUG, "not yet implemented\n");
ast_mutex_unlock(&p->lock);
-@@ -2736,7 +2780,13 @@ static int zt_hangup(struct ast_channel
+@@ -2737,7 +2781,13 @@ static int zt_hangup(struct ast_channel
}
}
#endif
@@ -142,7 +142,7 @@
res = zt_set_hook(p->subs[SUB_REAL].zfd, ZT_ONHOOK);
if (res < 0) {
ast_log(LOG_WARNING, "Unable to hangup line %s\n", ast->name);
-@@ -2913,6 +2963,13 @@ static int zt_answer(struct ast_channel
+@@ -2914,6 +2964,13 @@ static int zt_answer(struct ast_channel
zt_train_ec(p);
break;
#endif
@@ -156,7 +156,7 @@
case 0:
ast_mutex_unlock(&p->lock);
return 0;
-@@ -7275,6 +7332,10 @@ static int pri_create_spanmap(int span,
+@@ -7297,6 +7354,10 @@ static int pri_create_spanmap(int span,
#endif
@@ -167,7 +167,7 @@
static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pri *pri, int reloading)
{
/* Make a zt_pvt structure for this interface (or CRV if "pri" is specified) */
-@@ -7503,6 +7564,37 @@ static struct zt_pvt *mkintf(int channel
+@@ -7525,6 +7586,37 @@ static struct zt_pvt *mkintf(int channel
tmp->prioffset = 0;
}
#endif
@@ -205,7 +205,7 @@
} else {
conf.chan.sig = tmp->sig;
conf.chan.radio = tmp->radio;
-@@ -7786,6 +7878,12 @@ static inline int available(struct zt_pv
+@@ -7814,6 +7906,12 @@ static inline int available(struct zt_pv
return 1;
}
#endif
@@ -218,7 +218,7 @@
if (!(p->radio || (p->oprmode < 0)))
{
if (!p->sig || (p->sig == SIG_FXSLS))
-@@ -8140,6 +8238,235 @@ next:
+@@ -8171,6 +8269,235 @@ next:
return tmp;
}
@@ -454,7 +454,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8415,6 +8742,18 @@ static void zt_pri_error(char *s, int sp
+@@ -8450,6 +8777,18 @@ static void zt_pri_error(char *s, int sp
ast_log(LOG_WARNING, "%d %s", span, s);
}
@@ -473,7 +473,7 @@
static int pri_check_restart(struct zt_pri *pri)
{
if ((pri->nodetype != PRI_NETWORK) && (pri->nodetype != PRI_CPE)) {
-@@ -10851,6 +11190,243 @@ static int app_zapInband(struct ast_chan
+@@ -10887,6 +11226,243 @@ static int app_zapInband(struct ast_chan
#endif /* HAVE_PRI */
@@ -717,7 +717,7 @@
static int app_zapEC(struct ast_channel *chan, void *data)
{
int res=-1;
-@@ -11472,6 +12048,12 @@ static int __unload_module(void)
+@@ -11508,6 +12084,12 @@ static int __unload_module(void)
ast_unregister_application(zapCD_app);
ast_unregister_application(zapInband_app);
#endif
@@ -730,7 +730,7 @@
ast_cli_unregister_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
ast_unregister_application(zapEC_app);
ast_manager_unregister( "ZapDialOffhook" );
-@@ -11992,6 +12574,11 @@ static int process_zap(struct zt_chan_co
+@@ -12028,6 +12610,11 @@ static int process_zap(struct zt_chan_co
confp->chan.radio = 0;
confp->pri.nodetype = BRI_CPE;
#endif
@@ -742,7 +742,7 @@
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
}
-@@ -12134,6 +12721,10 @@ static int process_zap(struct zt_chan_co
+@@ -12170,6 +12757,10 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.nocid, v->value, sizeof(confp->pri.nocid));
} else if (!strcasecmp(v->name, "withheldcid")) {
ast_copy_string(confp->pri.withheldcid, v->value, sizeof(confp->pri.withheldcid));
@@ -753,7 +753,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -12488,6 +13079,10 @@ static int load_module(void)
+@@ -12524,6 +13115,10 @@ static int load_module(void)
ast_register_application(zap_send_keypad_facility_app, zap_send_keypad_facility_exec,
zap_send_keypad_facility_synopsis, zap_send_keypad_facility_descrip);
#endif
@@ -764,7 +764,7 @@
res = setup_zap(0);
/* Make sure we can register our Zap channel type */
if (res)
-@@ -12506,6 +13101,12 @@ static int load_module(void)
+@@ -12542,6 +13137,12 @@ static int load_module(void)
#endif
ast_register_application(zapEC_app, app_zapEC, zapEC_synopsis, zapEC_tdesc);
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
@@ -777,7 +777,7 @@
memset(round_robin, 0, sizeof(round_robin));
ast_manager_register( "ZapTransfer", 0, action_transfer, "Transfer Zap Channel" );
-@@ -12519,7 +13120,48 @@ static int load_module(void)
+@@ -12555,7 +13156,48 @@ static int load_module(void)
return res;
}
@@ -839,7 +839,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
--- a/configure
+++ b/configure
-@@ -25666,6 +25666,188 @@ echo "$as_me: *** without explicitly spe
+@@ -25979,6 +25979,188 @@ echo "$as_me: *** without explicitly spe
fi
fi
Modified: asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded Thu Apr 3 02:54:28 2008
@@ -1,6 +1,6 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -5133,7 +5133,7 @@ struct app_tmp {
+@@ -5144,7 +5144,7 @@ struct app_tmp {
};
/*! \brief run the application and free the descriptor once done */
@@ -50,7 +50,7 @@
int debugfd;
};
-@@ -7463,6 +7477,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7485,6 +7499,7 @@ static struct zt_pvt *mkintf(int channel
pris[span].overlapdial = conf.pri.overlapdial;
pris[span].usercid = conf.pri.usercid;
pris[span].suspended_calls = NULL;
@@ -58,7 +58,7 @@
pris[span].facilityenable = conf.pri.facilityenable;
ast_copy_string(pris[span].idledial, conf.pri.idledial, sizeof(pris[span].idledial));
ast_copy_string(pris[span].idleext, conf.pri.idleext, sizeof(pris[span].idleext));
-@@ -8138,6 +8153,58 @@ static struct zt_pvt *pri_find_crv(struc
+@@ -8169,6 +8184,58 @@ static struct zt_pvt *pri_find_crv(struc
return NULL;
}
@@ -117,7 +117,7 @@
static int pri_find_principle(struct zt_pri *pri, int channel)
{
-@@ -9584,18 +9651,150 @@ static void *pri_dchannel(void *vpri)
+@@ -9620,18 +9687,150 @@ static void *pri_dchannel(void *vpri)
pri_hold_reject(pri->pri, e->hold_req.call);
break;
}
@@ -274,7 +274,7 @@
case PRI_EVENT_DISPLAY_RECEIVED:
ast_log(LOG_NOTICE, "DISPLAY IE: [ %s ] received\n",e->display.text);
chanpos = pri_find_principle(pri, e->display.channel);
-@@ -9752,9 +9951,20 @@ static void *pri_dchannel(void *vpri)
+@@ -9788,9 +9987,20 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -298,7 +298,7 @@
}
}
break;
-@@ -9817,11 +10027,63 @@ static void *pri_dchannel(void *vpri)
+@@ -9853,11 +10063,63 @@ static void *pri_dchannel(void *vpri)
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s");
}
@@ -367,7 +367,7 @@
} else {
pri_hangup(pri->pri, pri->pvts[chanpos]->call, e->hangup.cause, -1);
pri->pvts[chanpos]->call = NULL;
-@@ -9851,7 +10113,19 @@ static void *pri_dchannel(void *vpri)
+@@ -9887,7 +10149,19 @@ static void *pri_dchannel(void *vpri)
if (pri->nodetype != BRI_NETWORK_PTMP) {
ast_log(LOG_WARNING, "Hangup REQ on bad channel %d/%d on span %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span);
} else {
@@ -388,7 +388,7 @@
}
}
}
-@@ -10011,16 +10285,73 @@ static void *pri_dchannel(void *vpri)
+@@ -10047,16 +10321,73 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_FACILITY:
Modified: asterisk/trunk/debian/patches/feature-bridge
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/feature-bridge?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/feature-bridge (original)
+++ asterisk/trunk/debian/patches/feature-bridge Thu Apr 3 02:54:28 2008
@@ -61,7 +61,7 @@
return NULL;
}
-@@ -2369,6 +2391,125 @@ static int handle_showfeatures(int fd, i
+@@ -2371,6 +2393,125 @@ static int handle_showfeatures(int fd, i
return RESULT_SUCCESS;
}
@@ -187,7 +187,7 @@
static char showfeatures_help[] =
"Usage: feature list\n"
" Lists currently configured features.\n";
-@@ -3196,6 +3337,154 @@ static int load_config(void)
+@@ -3198,6 +3339,154 @@ static int load_config(void)
}
@@ -342,7 +342,7 @@
static int reload(void)
{
autoanswer_reregister_extensions();
-@@ -3206,6 +3495,8 @@ static int load_module(void)
+@@ -3208,6 +3497,8 @@ static int load_module(void)
{
int res;
@@ -351,7 +351,7 @@
memset(parking_ext, 0, sizeof(parking_ext));
memset(parking_con, 0, sizeof(parking_con));
-@@ -3221,6 +3512,7 @@ static int load_module(void)
+@@ -3223,6 +3514,7 @@ static int load_module(void)
ast_manager_register("ParkedCalls", 0, manager_parking_status, "List parked calls" );
ast_manager_register2("Park", EVENT_FLAG_CALL, manager_park,
"Park a channel", mandescr_park);
@@ -359,7 +359,7 @@
}
res |= ast_register_application(holdedcall, retrieve_call_exec, synopsis, descrip);
-@@ -3241,9 +3533,11 @@ static int unload_module(void)
+@@ -3243,9 +3535,11 @@ static int unload_module(void)
ast_module_user_hangup_all();
ast_manager_unregister("ParkedCalls");
Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-no-deps-on-asterisk?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Thu Apr 3 02:54:28 2008
@@ -9,7 +9,7 @@
--- a/main/Makefile
+++ b/main/Makefile
-@@ -126,13 +126,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+@@ -130,13 +130,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
OBJS:=$(sort $(OBJS))
@@ -23,7 +23,7 @@
asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
-@@ -141,11 +134,7 @@ asterisk: $(OBJS) editline/libedit.a db1
+@@ -145,11 +138,7 @@ asterisk: $(OBJS) editline/libedit.a db1
@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
Modified: asterisk/trunk/debian/patches/misdn_FOP
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/misdn_FOP?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/misdn_FOP (original)
+++ asterisk/trunk/debian/patches/misdn_FOP Thu Apr 3 02:54:28 2008
@@ -23,7 +23,7 @@
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
-@@ -3340,17 +3340,19 @@ static void update_name(struct ast_chann
+@@ -3334,17 +3334,19 @@ static void update_name(struct ast_chann
{
int chan_offset=0;
int tmp_port = misdn_cfg_get_next_port(0);
@@ -48,7 +48,7 @@
}
static struct ast_channel *misdn_new(struct chan_list *chlist, int state, char *exten, char *callerid, int format, int port, int c)
-@@ -3370,7 +3372,10 @@ static struct ast_channel *misdn_new(str
+@@ -3364,7 +3366,10 @@ static struct ast_channel *misdn_new(str
if (callerid)
ast_callerid_parse(callerid, &cid_name, &cid_num);
Modified: asterisk/trunk/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-nobg?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-nobg Thu Apr 3 02:54:28 2008
@@ -20,7 +20,7 @@
# comment this line out to have this script _not_ kill all mpg123 processes when
# asterisk exits
-@@ -176,4 +177,8 @@ run_asterisk()
+@@ -171,4 +172,8 @@ run_asterisk()
done
}
Modified: asterisk/trunk/debian/patches/silence-buildsum-warning
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/silence-buildsum-warning?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/silence-buildsum-warning (original)
+++ asterisk/trunk/debian/patches/silence-buildsum-warning Thu Apr 3 02:54:28 2008
@@ -6,7 +6,7 @@
--- a/main/loader.c
+++ b/main/loader.c
-@@ -617,7 +617,9 @@ static unsigned int inspect_module(const
+@@ -625,7 +625,9 @@ static unsigned int inspect_module(const
}
if (!ast_test_flag(mod->info, AST_MODFLAG_BUILDSUM)) {
Modified: asterisk/trunk/debian/patches/use-libpri-bristuffed
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/use-libpri-bristuffed?rev=5461&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/use-libpri-bristuffed (original)
+++ asterisk/trunk/debian/patches/use-libpri-bristuffed Thu Apr 3 02:54:28 2008
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -25337,18 +25337,18 @@ fi
+@@ -25650,18 +25650,18 @@ fi
if test "${AST_PRI_FOUND}" = "yes"; then
@@ -25,7 +25,7 @@
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-@@ -25357,8 +25357,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
+@@ -25670,8 +25670,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
@@ -36,7 +36,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25366,7 +25366,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -25679,7 +25679,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -45,7 +45,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -25398,15 +25398,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25711,15 +25711,15 @@ rm -f core conftest.err conftest.$ac_obj
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
@@ -64,7 +64,7 @@
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -25439,25 +25439,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
+@@ -25752,25 +25752,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
@@ -106,7 +106,7 @@
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
-@@ -25466,8 +25466,8 @@ _ASBOX
+@@ -25779,8 +25779,8 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -119,7 +119,7 @@
else
--- a/configure.ac
+++ b/configure.ac
-@@ -823,7 +823,7 @@ fi
+@@ -1210,7 +1210,7 @@ fi
AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
More information about the Pkg-voip-commits
mailing list