[Pkg-voip-commits] r5801 - in /asterisk/trunk/debian/patches: ./ bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon May 26 01:25:00 UTC 2008
Author: paravoid
Date: Mon May 26 01:25:00 2008
New Revision: 5801
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5801
Log:
quilt refresh again
Modified:
asterisk/trunk/debian/patches/allow-tilde-destdir
asterisk/trunk/debian/patches/bristuff/answer-before-say
asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
asterisk/trunk/debian/patches/bristuff/app-dial-etc
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_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/isdn-fixes
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/xagi
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/debian-banner
asterisk/trunk/debian/patches/feature-bridge
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
asterisk/trunk/debian/patches/pubkey_jnctn
asterisk/trunk/debian/patches/safe_asterisk-config
asterisk/trunk/debian/patches/safe_asterisk-nobg
asterisk/trunk/debian/patches/use-libpri-bristuffed
Modified: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (original)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Mon May 26 01:25:00 2008
@@ -10,7 +10,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -505,7 +505,7 @@ ifneq ($(findstring ~,$(DESTDIR)),)
+@@ -507,7 +507,7 @@ ifneq ($(findstring ~,$(DESTDIR)),)
@exit 1
endif
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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/trunk/debian/patches/bristuff/answer-before-say Mon May 26 01:25:00 2008
@@ -3,7 +3,7 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -6074,6 +6074,9 @@ static int pbx_builtin_saynumber(struct
+@@ -6076,6 +6076,9 @@ static int pbx_builtin_saynumber(struct
return -1;
}
}
@@ -13,7 +13,7 @@
if (ast_say_number(chan, atoi(tmp), "", chan->language, options)) {
ast_log(LOG_WARNING, "We were unable to say the number %s, is it too large?\n", tmp);
-@@ -6081,8 +6084,12 @@ static int pbx_builtin_saydigits(struct
+@@ -6088,8 +6091,12 @@ static int pbx_builtin_saydigits(struct
{
int res = 0;
@@ -27,7 +27,7 @@
return res;
}
-@@ -6090,8 +6097,12 @@ static int pbx_builtin_saycharacters(str
+@@ -6097,8 +6104,12 @@ static int pbx_builtin_saycharacters(str
{
int res = 0;
@@ -41,7 +41,7 @@
return res;
}
-@@ -6099,8 +6110,12 @@ static int pbx_builtin_sayphonetic(struc
+@@ -6106,8 +6117,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband Mon May 26 01:25:00 2008
@@ -88,7 +88,7 @@
ast_indicate(chan, AST_CONTROL_RINGING);
sentringing++;
}
-@@ -1436,7 +1440,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1442,7 +1446,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-etc
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-etc?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-etc (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-etc Mon May 26 01:25:00 2008
@@ -8,7 +8,7 @@
static char *app = "Dial";
-@@ -1646,23 +1647,25 @@ static int dial_exec_full(struct ast_cha
+@@ -1652,23 +1653,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-meetme-avoid-overflows
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows (original)
+++ asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows Mon May 26 01:25:00 2008
@@ -1,6 +1,6 @@
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
-@@ -1403,8 +1403,9 @@ static int conf_run(struct ast_channel *
+@@ -1405,8 +1405,9 @@ static int conf_run(struct ast_channel *
char members[10] = "";
int dtmf, opt_waitmarked_timeout = 0;
time_t timeout = 0;
@@ -11,7 +11,7 @@
char *buf = __buf + AST_FRIENDLY_OFFSET;
int setusercount = 0;
-@@ -1604,7 +1605,7 @@ static int conf_run(struct ast_channel *
+@@ -1615,7 +1616,7 @@ static int conf_run(struct ast_channel *
}
/* Setup buffering information */
memset(&bi, 0, sizeof(bi));
@@ -20,7 +20,7 @@
bi.txbufpolicy = ZT_POLICY_IMMEDIATE;
bi.rxbufpolicy = ZT_POLICY_IMMEDIATE;
bi.numbufs = audio_buffers;
-@@ -1915,6 +1916,14 @@ static int conf_run(struct ast_channel *
+@@ -1926,6 +1927,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Mon May 26 01:25:00 2008
@@ -120,7 +120,7 @@
} else {
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -611,8 +611,13 @@ int ast_channel_datastore_remove(struct
+@@ -613,8 +613,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);
@@ -146,7 +146,7 @@
}
struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid)
-@@ -3647,7 +3647,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3673,7 +3673,7 @@ void ast_set_callerid(struct ast_channel
ast_channel_unlock(chan);
}
@@ -155,7 +155,7 @@
{
int oldstate = chan->_state;
-@@ -3655,7 +3655,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3681,7 +3681,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",
-@@ -3672,6 +3672,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3698,6 +3698,11 @@ int ast_setstate(struct ast_channel *cha
return 0;
}
@@ -230,7 +230,7 @@
free(cbprev);
}
hint->callbacks = NULL;
-@@ -4019,7 +4019,7 @@ void ast_merge_contexts_and_delete(struc
+@@ -4021,7 +4021,7 @@ void ast_merge_contexts_and_delete(struc
while (thiscb) {
prevcb = thiscb;
thiscb = thiscb->next;
@@ -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);
-@@ -8538,7 +8538,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8593,7 +8593,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;
-@@ -12709,7 +12709,7 @@ static void handle_response(struct sip_p
+@@ -12783,7 +12783,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);
@@ -308,7 +308,7 @@
{ -1, "all" },
{ 0, "none" },
};
-@@ -2538,10 +2539,12 @@ int ast_manager_unregister(char *action)
+@@ -2551,10 +2552,12 @@ int ast_manager_unregister(char *action)
return 0;
}
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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Mon May 26 01:25:00 2008
@@ -16,7 +16,7 @@
/*! \brief Display or send an image */
int (* const send_image)(struct ast_channel *chan, struct ast_frame *frame);
-@@ -689,6 +692,16 @@ struct ast_channel *ast_request_and_dial
+@@ -689,6 +694,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);
@@ -33,7 +33,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"
-@@ -910,6 +923,16 @@ int ast_set_write_format(struct ast_chan
+@@ -910,6 +925,16 @@ int ast_set_write_format(struct ast_chan
*/
int ast_sendtext(struct ast_channel *chan, const char *text);
@@ -52,7 +52,7 @@
* \param timeout timeout in milliseconds (0 for infinite wait)
--- a/main/channel.c
+++ b/main/channel.c
-@@ -2448,6 +2448,21 @@ int ast_sendtext(struct ast_channel *cha
+@@ -2472,6 +2472,21 @@ int ast_sendtext(struct ast_channel *cha
return res;
}
@@ -74,7 +74,7 @@
int ast_senddigit_begin(struct ast_channel *chan, char digit)
{
/* Device does not support DTMF tones, lets fake
-@@ -4491,6 +4504,25 @@ void ast_channel_stop_silence_generator(
+@@ -4515,6 +4530,25 @@ void ast_channel_stop_silence_generator(
}
@@ -112,7 +112,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.
-@@ -1426,6 +1429,49 @@ static int action_hangup(struct mansessi
+@@ -1427,6 +1430,49 @@ static int action_hangup(struct mansessi
return 0;
}
@@ -162,7 +162,7 @@
static char mandescr_setvar[] =
"Description: Set a global or local channel variable.\n"
"Variables: (Names marked with * are required)\n"
-@@ -2840,6 +2886,7 @@ int init_manager(void)
+@@ -2853,6 +2899,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript Mon May 26 01:25:00 2008
@@ -95,7 +95,7 @@
ast_channel_unlock(c);
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
-@@ -2880,13 +2880,13 @@ static int try_calling(struct queue_ent
+@@ -2891,13 +2891,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause Mon May 26 01:25:00 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.
-@@ -3342,7 +3345,7 @@ static int iax2_hangup(struct ast_channe
+@@ -3362,7 +3365,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);
-@@ -3396,7 +3399,8 @@ static int iax2_setoption(struct ast_cha
+@@ -3416,7 +3419,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME (original)
+++ asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME Mon May 26 01:25:00 2008
@@ -10,7 +10,7 @@
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -2389,6 +2389,7 @@ static void ast_readconfig(void)
+@@ -2427,6 +2427,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) {
-@@ -2513,6 +2514,8 @@ static void ast_readconfig(void)
+@@ -2551,6 +2552,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-autoanswer (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-autoanswer Mon May 26 01:25:00 2008
@@ -83,7 +83,7 @@
);
if (peer && adsipark && ast_adsi_available(peer)) {
-@@ -1638,11 +1675,13 @@ static void post_manager_event(const cha
+@@ -1656,11 +1693,13 @@ static void post_manager_event(const cha
"Exten: %s\r\n"
"Channel: %s\r\n"
"CallerID: %s\r\n"
@@ -99,7 +99,7 @@
);
}
-@@ -1910,10 +1949,12 @@ static int park_exec(struct ast_channel
+@@ -1928,10 +1967,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);
-@@ -2067,15 +2108,10 @@ static struct ast_cli_entry cli_show_fea
+@@ -2085,15 +2126,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)
-@@ -2099,12 +2135,13 @@ static int manager_parking_status( struc
+@@ -2117,12 +2153,13 @@ static int manager_parking_status( struc
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
@@ -148,7 +148,7 @@
idText);
}
-@@ -2179,6 +2216,427 @@ static int manager_park(struct mansessio
+@@ -2197,6 +2234,427 @@ static int manager_park(struct mansessio
return 0;
}
@@ -576,7 +576,7 @@
int ast_pickup_call(struct ast_channel *chan)
{
-@@ -2442,6 +2900,7 @@ static int load_config(void)
+@@ -2460,6 +2918,7 @@ static int load_config(void)
static int reload(void)
{
@@ -584,7 +584,7 @@
return load_config();
}
-@@ -2465,6 +2924,12 @@ static int load_module(void)
+@@ -2483,6 +2942,12 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -597,7 +597,7 @@
res |= ast_devstate_prov_add("Park", metermaidstate);
return res;
-@@ -2479,6 +2944,8 @@ static int unload_module(void)
+@@ -2497,6 +2962,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-holdedcalls (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-holdedcalls Mon May 26 01:25:00 2008
@@ -71,7 +71,7 @@
char *ast_parking_ext(void)
{
return parking_ext;
-@@ -2034,6 +2058,282 @@ static int park_exec(struct ast_channel
+@@ -2052,6 +2076,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;
-@@ -2915,6 +3215,7 @@ static int load_module(void)
+@@ -2933,6 +3233,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);
-@@ -2924,6 +3225,7 @@ static int load_module(void)
+@@ -2942,6 +3243,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);
-@@ -2946,6 +3248,7 @@ static int unload_module(void)
+@@ -2964,6 +3266,7 @@ static int unload_module(void)
ast_unregister_application(parkcall);
ast_unregister_application(autoanswer);
ast_unregister_application(autoanswerlogin);
Modified: asterisk/trunk/debian/patches/bristuff/isdn-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/isdn-fixes?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/isdn-fixes (original)
+++ asterisk/trunk/debian/patches/bristuff/isdn-fixes Mon May 26 01:25:00 2008
@@ -11,7 +11,7 @@
/* Restore saved values */
--- a/main/channel.c
+++ b/main/channel.c
-@@ -3874,6 +3874,10 @@ enum ast_bridge_result ast_channel_bridg
+@@ -3898,6 +3898,10 @@ enum ast_bridge_result ast_channel_bridg
c1->name, c1->_bridge->name);
return -1;
}
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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Mon May 26 01:25:00 2008
@@ -2,7 +2,7 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -680,6 +680,18 @@ void ast_channel_free(struct ast_channe
+@@ -682,6 +682,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
-@@ -695,8 +707,12 @@ struct ast_channel *ast_request(const ch
+@@ -697,8 +709,12 @@ struct ast_channel *ast_request(const ch
*/
struct ast_channel *ast_request_and_dial(const char *type, int format, void *data, int timeout, int *reason, const char *cidnum, const char *cidname);
@@ -34,7 +34,7 @@
/*! \brief "Requests" a channel for sending a message
* \param type type of channel to request
* \param data data to pass to the channel requester
-@@ -988,6 +1004,8 @@ struct ast_channel *ast_get_channel_by_e
+@@ -990,6 +1006,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);
@@ -117,7 +117,7 @@
}
/*! \brief Wait, look for hangups and condition arg */
-@@ -2836,6 +2844,12 @@ char *ast_channel_reason2str(int reason)
+@@ -2862,6 +2870,12 @@ char *ast_channel_reason2str(int reason)
struct ast_channel *__ast_request_and_dial(const char *type, int format, void *data, int timeout, int *outstate, const char *cid_num, const char *cid_name, struct outgoing_helper *oh)
{
@@ -130,7 +130,7 @@
int dummy_outstate;
int cause = 0;
struct ast_channel *chan;
-@@ -2847,7 +2861,7 @@ struct ast_channel *__ast_request_and_di
+@@ -2873,7 +2887,7 @@ struct ast_channel *__ast_request_and_di
else
outstate = &dummy_outstate; /* make outstate always a valid pointer */
@@ -139,7 +139,7 @@
if (!chan) {
ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
/* compute error and return */
-@@ -2967,8 +2981,12 @@ struct ast_channel *ast_request_and_dial
+@@ -2993,8 +3007,12 @@ struct ast_channel *ast_request_and_dial
{
return __ast_request_and_dial(type, format, data, timeout, outstate, cidnum, cidname, NULL);
}
@@ -153,7 +153,7 @@
{
struct chanlist *chan;
struct ast_channel *c;
-@@ -3007,6 +3025,7 @@ struct ast_channel *ast_request(const ch
+@@ -3033,6 +3051,7 @@ struct ast_channel *ast_request(const ch
if (!(c = chan->tech->requester(type, capabilities | videoformat, data, cause)))
return NULL;
@@ -161,7 +161,7 @@
/* no need to generate a Newchannel event here; it is done in the channel_alloc call */
return c;
}
-@@ -3018,6 +3037,11 @@ struct ast_channel *ast_request(const ch
+@@ -3044,6 +3063,11 @@ struct ast_channel *ast_request(const ch
return NULL;
}
@@ -195,7 +195,7 @@
*
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -4990,7 +4990,7 @@ static int ast_pbx_outgoing_cdr_failed(v
+@@ -4992,7 +4992,7 @@ static int ast_pbx_outgoing_cdr_failed(v
return 0; /* success */
}
@@ -204,7 +204,7 @@
{
struct ast_channel *chan;
struct async_stat *as;
-@@ -5000,7 +5000,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -5002,7 +5002,7 @@ int ast_pbx_outgoing_exten(const char *t
if (sync) {
LOAD_OH(oh);
@@ -213,7 +213,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5092,7 +5092,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -5094,7 +5094,7 @@ int ast_pbx_outgoing_exten(const char *t
res = -1;
goto outgoing_exten_cleanup;
}
@@ -222,7 +222,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5132,6 +5132,10 @@ outgoing_exten_cleanup:
+@@ -5134,6 +5134,10 @@ outgoing_exten_cleanup:
return res;
}
@@ -233,7 +233,7 @@
struct app_tmp {
char app[256];
char data[256];
-@@ -5156,7 +5160,7 @@ static void *ast_pbx_run_app(void *data)
+@@ -5158,7 +5162,7 @@ static void *ast_pbx_run_app(void *data)
return NULL;
}
@@ -242,7 +242,7 @@
{
struct ast_channel *chan;
struct app_tmp *tmp;
-@@ -5175,7 +5179,7 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5177,7 +5181,7 @@ int ast_pbx_outgoing_app(const char *typ
goto outgoing_app_cleanup;
}
if (sync) {
@@ -251,7 +251,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 */
-@@ -5257,7 +5261,7 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5259,7 +5263,7 @@ int ast_pbx_outgoing_app(const char *typ
res = -1;
goto outgoing_app_cleanup;
}
@@ -260,7 +260,7 @@
if (!chan) {
free(as);
res = -1;
-@@ -5297,6 +5301,10 @@ outgoing_app_cleanup:
+@@ -5299,6 +5303,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Mon May 26 01:25:00 2008
@@ -36,7 +36,7 @@
static const char *app_ext = "ExtenSpy";
static const char *desc_ext =
" ExtenSpy(exten[@context][|options]): This application is used to listen to the\n"
-@@ -457,7 +479,7 @@ static struct chanspy_ds *setup_chanspy_
+@@ -456,7 +478,7 @@ static struct chanspy_ds *setup_chanspy_
static struct chanspy_ds *next_channel(struct ast_channel *chan,
const struct ast_channel *last, const char *spec,
@@ -45,7 +45,7 @@
{
struct ast_channel *this;
-@@ -466,6 +488,8 @@ redo:
+@@ -465,6 +487,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);
@@ -54,7 +54,7 @@
else
this = ast_channel_walk_locked(last);
-@@ -486,7 +510,7 @@ redo:
+@@ -485,7 +509,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,
@@ -63,7 +63,7 @@
{
char nameprefix[AST_NAME_STRLEN];
char peer_name[AST_NAME_STRLEN + 5];
-@@ -531,11 +555,11 @@ static int common_exec(struct ast_channe
+@@ -530,11 +554,11 @@ static int common_exec(struct ast_channe
waitms = 100;
num_spyed_upon = 0;
@@ -77,7 +77,7 @@
const char *group;
int igrp = !mygroup;
char *groups[25];
-@@ -737,7 +761,7 @@ static int chanspy_exec(struct ast_chann
+@@ -733,7 +757,7 @@ static int chanspy_exec(struct ast_chann
}
}
@@ -86,24 +86,19 @@
if (fd)
close(fd);
-@@ -822,7 +846,92 @@ static int extenspy_exec(struct ast_chan
+@@ -818,7 +842,7 @@ static int extenspy_exec(struct ast_chan
}
}
- res = common_exec(chan, &flags, volfactor, fd, mygroup, NULL, exten, context);
+ res = common_exec(chan, &flags, volfactor, fd, mygroup, NULL, exten, context, NULL);
-+
-+ if (fd)
-+ close(fd);
-+
-+ if (oldwf && ast_set_write_format(chan, oldwf) < 0)
-+ ast_log(LOG_ERROR, "Could Not Set Write Format.\n");
-+
-+ ast_module_user_remove(u);
-+
-+ return res;
-+}
-+
+
+ if (fd)
+ close(fd);
+@@ -831,14 +855,100 @@ static int extenspy_exec(struct ast_chan
+ return res;
+ }
+
+static int chanspychan_exec(struct ast_channel *chan, void *data)
+{
+ struct ast_module_user *u;
@@ -177,13 +172,18 @@
+ }
+
+ res = common_exec(chan, &flags, volfactor, fd, mygroup, NULL, NULL, NULL, uniqueid);
-
- if (fd)
- close(fd);
-@@ -835,14 +944,15 @@ static int extenspy_exec(struct ast_chan
- return res;
- }
-
++
++ if (fd)
++ close(fd);
++
++ if (oldwf && ast_set_write_format(chan, oldwf) < 0)
++ ast_log(LOG_ERROR, "Could Not Set Write Format.\n");
++
++ ast_module_user_remove(u);
++
++ return res;
++}
++
+
static int unload_module(void)
{
@@ -197,7 +197,7 @@
return res;
}
-@@ -853,6 +963,7 @@ static int load_module(void)
+@@ -849,6 +959,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Mon May 26 01:25:00 2008
@@ -9,7 +9,7 @@
struct ast_variable *vars;
};
-@@ -1415,11 +1417,20 @@ static int action_hangup(struct mansessi
+@@ -1416,11 +1418,20 @@ static int action_hangup(struct mansessi
{
struct ast_channel *c = NULL;
const char *name = astman_get_header(m, "Channel");
@@ -33,7 +33,7 @@
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
-@@ -1670,12 +1681,18 @@ static int action_redirect(struct manses
+@@ -1671,12 +1682,18 @@ static int action_redirect(struct manses
const char *exten = astman_get_header(m, "Exten");
const char *context = astman_get_header(m, "Context");
const char *priority = astman_get_header(m, "Priority");
@@ -54,7 +54,7 @@
return 0;
}
if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) {
-@@ -1684,8 +1701,18 @@ static int action_redirect(struct manses
+@@ -1685,8 +1702,18 @@ static int action_redirect(struct manses
return 0;
}
}
@@ -74,7 +74,7 @@
if (!chan) {
char buf[BUFSIZ];
snprintf(buf, sizeof(buf), "Channel does not exist: %s", name);
-@@ -1697,8 +1724,11 @@ static int action_redirect(struct manses
+@@ -1698,8 +1725,11 @@ static int action_redirect(struct manses
ast_channel_unlock(chan);
return 0;
}
@@ -87,7 +87,7 @@
if (chan2 && ast_check_hangup(chan2)) {
astman_send_error(s, m, "Redirect failed, extra channel not up.\n");
ast_channel_unlock(chan);
-@@ -1707,9 +1737,9 @@ static int action_redirect(struct manses
+@@ -1708,9 +1738,9 @@ static int action_redirect(struct manses
}
res = ast_async_goto(chan, context, exten, pi);
if (!res) {
@@ -99,7 +99,7 @@
else
res = -1;
if (!res)
-@@ -1788,15 +1818,15 @@ static void *fast_originate(void *data)
+@@ -1789,15 +1819,15 @@ static void *fast_originate(void *data)
char requested_channel[AST_CHANNEL_NAME];
if (!ast_strlen_zero(in->app)) {
@@ -119,7 +119,7 @@
}
if (!chan)
-@@ -1856,6 +1886,7 @@ static int action_originate(struct manse
+@@ -1857,6 +1887,7 @@ static int action_originate(struct manse
const char *appdata = astman_get_header(m, "Data");
const char *async = astman_get_header(m, "Async");
const char *id = astman_get_header(m, "ActionID");
@@ -127,7 +127,7 @@
struct ast_variable *vars = astman_get_variables(m);
char *tech, *data;
char *l = NULL, *n = NULL;
-@@ -1865,6 +1896,9 @@ static int action_originate(struct manse
+@@ -1866,6 +1897,9 @@ static int action_originate(struct manse
int reason = 0;
char tmp[256];
char tmp2[256];
@@ -137,7 +137,7 @@
pthread_t th;
pthread_attr_t attr;
-@@ -1882,6 +1916,10 @@ static int action_originate(struct manse
+@@ -1883,6 +1917,10 @@ static int action_originate(struct manse
astman_send_error(s, m, "Invalid timeout\n");
return 0;
}
@@ -148,7 +148,7 @@
ast_copy_string(tmp, name, sizeof(tmp));
tech = tmp;
data = strchr(tmp, '/');
-@@ -1901,6 +1939,7 @@ static int action_originate(struct manse
+@@ -1902,6 +1940,7 @@ static int action_originate(struct manse
if (ast_strlen_zero(l))
l = NULL;
}
@@ -156,7 +156,7 @@
if (ast_true(async)) {
struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));
if (!fast) {
-@@ -1920,8 +1959,10 @@ static int action_originate(struct manse
+@@ -1921,8 +1960,10 @@ static int action_originate(struct manse
ast_copy_string(fast->context, context, sizeof(fast->context));
ast_copy_string(fast->exten, exten, sizeof(fast->exten));
ast_copy_string(fast->account, account, sizeof(fast->account));
@@ -167,7 +167,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&th, &attr, fast_originate, fast)) {
-@@ -1932,19 +1973,28 @@ static int action_originate(struct manse
+@@ -1933,19 +1974,28 @@ static int action_originate(struct manse
pthread_attr_destroy(&attr);
}
} else if (!ast_strlen_zero(app)) {
@@ -213,7 +213,7 @@
#include <unistd.h>
#ifdef POLLCOMPAT
#include "asterisk/poll-compat.h"
-@@ -1037,6 +1040,8 @@ int ast_waitfordigit_full(struct ast_cha
+@@ -1039,6 +1042,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/xagi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/xagi?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/xagi (original)
+++ asterisk/trunk/debian/patches/bristuff/xagi Mon May 26 01:25:00 2008
@@ -121,7 +121,7 @@
close(x);
/* Execute script */
-@@ -357,12 +398,19 @@ static enum agi_result launch_script(cha
+@@ -359,12 +400,19 @@ static enum agi_result launch_script(cha
if (efd) {
*efd = audio[1];
}
@@ -142,7 +142,7 @@
*opid = pid;
return AGI_RESULT_SUCCESS;
-@@ -392,7 +440,7 @@ static void setup_env(struct ast_channel
+@@ -394,7 +442,7 @@ static void setup_env(struct ast_channel
fdprintf(fd, "agi_context: %s\n", chan->context);
fdprintf(fd, "agi_extension: %s\n", chan->exten);
fdprintf(fd, "agi_priority: %d\n", chan->priority);
@@ -151,7 +151,7 @@
/* User information */
fdprintf(fd, "agi_accountcode: %s\n", chan->accountcode ? chan->accountcode : "");
-@@ -1833,8 +1881,13 @@ static enum agi_result run_agi(struct as
+@@ -1835,8 +1883,13 @@ static enum agi_result run_agi(struct as
int ms;
enum agi_result returnstatus = AGI_RESULT_SUCCESS;
struct ast_frame *f;
@@ -165,7 +165,7 @@
FILE *readf;
/* how many times we'll retry if ast_waitfor_nandfs will return without either
channel or file descriptor in case select is interrupted by a system call (EINTR) */
-@@ -1848,10 +1901,22 @@ static enum agi_result run_agi(struct as
+@@ -1850,10 +1903,22 @@ static enum agi_result run_agi(struct as
return AGI_RESULT_FAILURE;
}
setlinebuf(readf);
@@ -190,7 +190,7 @@
if (c) {
retry = AGI_NANDFS_RETRY;
/* Idle the channel until we get a command */
-@@ -1869,6 +1934,16 @@ static enum agi_result run_agi(struct as
+@@ -1871,6 +1936,16 @@ static enum agi_result run_agi(struct as
ast_frfree(f);
}
} else if (outfd > -1) {
@@ -207,7 +207,7 @@
size_t len = sizeof(buf);
size_t buflen = 0;
-@@ -1914,6 +1989,7 @@ static enum agi_result run_agi(struct as
+@@ -1922,6 +1997,7 @@ static enum agi_result run_agi(struct as
if ((returnstatus < 0) || (returnstatus == AST_PBX_KEEPALIVE)) {
break;
}
@@ -215,7 +215,7 @@
} else {
if (--retry <= 0) {
ast_log(LOG_WARNING, "No channel, no fd?\n");
-@@ -2022,6 +2098,7 @@ static int agi_exec_full(struct ast_chan
+@@ -2030,6 +2106,7 @@ static int agi_exec_full(struct ast_chan
int argc = 0;
int fds[2];
int efd = -1;
@@ -223,7 +223,7 @@
int pid;
char *stringp;
AGI agi;
-@@ -2047,12 +2124,13 @@ static int agi_exec_full(struct ast_chan
+@@ -2056,12 +2133,13 @@ static int agi_exec_full(struct ast_chan
}
#endif
ast_replace_sigchld();
@@ -238,16 +238,16 @@
agi.fast = (res == AGI_RESULT_SUCCESS_FAST) ? 1 : 0;
res = run_agi(chan, argv[0], &agi, pid, &status, dead);
/* If the fork'd process returns non-zero, set AGISTATUS to FAILURE */
-@@ -2062,6 +2140,8 @@ static int agi_exec_full(struct ast_chan
+@@ -2071,6 +2149,8 @@ static int agi_exec_full(struct ast_chan
close(fds[1]);
if (efd > -1)
close(efd);
+ if (efd2 > -1)
+ close(efd2);
}
- ast_unreplace_sigchld();
+ ast_unreplace_sigchld();
ast_module_user_remove(u);
-@@ -2110,6 +2190,35 @@ static int eagi_exec(struct ast_channel
+@@ -2119,6 +2199,35 @@ static int eagi_exec(struct ast_channel
return res;
}
@@ -283,7 +283,7 @@
static int deadagi_exec(struct ast_channel *chan, void *data)
{
if (!ast_check_hangup(chan))
-@@ -2165,6 +2274,7 @@ static int unload_module(void)
+@@ -2174,6 +2283,7 @@ static int unload_module(void)
{
ast_module_user_hangup_all();
ast_cli_unregister_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
@@ -291,7 +291,7 @@
ast_unregister_application(eapp);
ast_unregister_application(deadapp);
return ast_unregister_application(app);
-@@ -2175,6 +2285,7 @@ static int load_module(void)
+@@ -2184,6 +2294,7 @@ static int load_module(void)
ast_cli_register_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
ast_register_application(deadapp, deadagi_exec, deadsynopsis, descrip);
ast_register_application(eapp, eagi_exec, esynopsis, descrip);
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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Mon May 26 01:25:00 2008
@@ -408,7 +408,7 @@
pri_destroycall(p->pri->pri, p->call);
p->call = NULL;
pri_rel(p->pri);
-@@ -4884,7 +4983,7 @@ static struct ast_frame *zt_read(struct
+@@ -4886,7 +4985,7 @@ static struct ast_frame *zt_read(struct
p->subs[index].f.data = NULL;
p->subs[index].f.datalen= 0;
}
@@ -417,7 +417,7 @@
/* Perform busy detection. etc on the zap line */
f = ast_dsp_process(ast, p->dsp, &p->subs[index].f);
if (f) {
-@@ -4896,8 +4995,9 @@ static struct ast_frame *zt_read(struct
+@@ -4898,8 +4997,9 @@ static struct ast_frame *zt_read(struct
}
} else if (f->frametype == AST_FRAME_DTMF) {
#ifdef HAVE_PRI
@@ -429,7 +429,7 @@
f->frametype = AST_FRAME_NULL;
f->subclass = 0;
}
-@@ -4972,7 +5072,9 @@ static int zt_write(struct ast_channel *
+@@ -4974,7 +5074,9 @@ static int zt_write(struct ast_channel *
#endif
/* Write a frame of (presumably voice) data */
if (frame->frametype != AST_FRAME_VOICE) {
@@ -440,7 +440,7 @@
ast_log(LOG_WARNING, "Don't know what to do with frame type '%d'\n", frame->frametype);
return 0;
}
-@@ -5040,7 +5142,7 @@ static int zt_indicate(struct ast_channe
+@@ -5042,7 +5144,7 @@ static int zt_indicate(struct ast_channe
switch (condition) {
case AST_CONTROL_BUSY:
#ifdef HAVE_PRI
@@ -449,7 +449,7 @@
chan->hangupcause = AST_CAUSE_USER_BUSY;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5122,7 +5224,7 @@ static int zt_indicate(struct ast_channe
+@@ -5124,7 +5226,7 @@ static int zt_indicate(struct ast_channe
case AST_CONTROL_CONGESTION:
chan->hangupcause = AST_CAUSE_CONGESTION;
#ifdef HAVE_PRI
@@ -458,7 +458,7 @@
chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5319,8 +5421,12 @@ static struct ast_channel *zt_new(struct
+@@ -5321,8 +5423,12 @@ static struct ast_channel *zt_new(struct
if (state == AST_STATE_RING)
tmp->rings = 1;
tmp->tech_pvt = i;
@@ -472,7 +472,7 @@
tmp->callgroup = i->callgroup;
tmp->pickupgroup = i->pickupgroup;
}
-@@ -5450,6 +5556,7 @@ static void *ss_thread(void *data)
+@@ -5452,6 +5558,7 @@ static void *ss_thread(void *data)
int len = 0;
int res;
int index;
@@ -480,7 +480,7 @@
/* in the bizarre case where the channel has become a zombie before we
even get started here, abort safely
-@@ -5478,10 +5585,17 @@ static void *ss_thread(void *data)
+@@ -5480,10 +5587,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)) {
@@ -501,7 +501,7 @@
if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num))
timeout = matchdigittimeout;
else
-@@ -6698,9 +6812,20 @@ static int handle_init_event(struct zt_p
+@@ -6697,9 +6811,20 @@ static int handle_init_event(struct zt_p
case ZT_EVENT_NOALARM:
i->inalarm = 0;
if (!i->unknown_alarm) {
@@ -522,7 +522,7 @@
} else {
i->unknown_alarm = 0;
}
-@@ -6709,7 +6834,13 @@ static int handle_init_event(struct zt_p
+@@ -6708,7 +6833,13 @@ static int handle_init_event(struct zt_p
i->inalarm = 1;
res = get_alarms(i);
do {
@@ -537,7 +537,7 @@
/* hack alert! Zaptel 1.4 now exposes FXO battery as an alarm, but asterisk 1.4
* doesn't know what to do with it. Don't confuse users with log messages. */
-@@ -6725,6 +6856,10 @@ static int handle_init_event(struct zt_p
+@@ -6724,6 +6855,10 @@ static int handle_init_event(struct zt_p
"Alarm: %s\r\n"
"Channel: %d\r\n",
alarm_str, i->channel);
@@ -548,7 +548,7 @@
} while (0);
/* fall thru intentionally */
case ZT_EVENT_ONHOOK:
-@@ -6769,8 +6904,10 @@ static int handle_init_event(struct zt_p
+@@ -6768,8 +6903,10 @@ static int handle_init_event(struct zt_p
zt_set_hook(i->subs[SUB_REAL].zfd, ZT_ONHOOK);
break;
case SIG_PRI:
@@ -561,7 +561,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);
-@@ -7063,6 +7200,8 @@ static int pri_resolve_span(int *span, i
+@@ -7062,6 +7199,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;
@@ -570,7 +570,7 @@
} else {
pris[*span].dchannels[0] = 24 + offset;
}
-@@ -7315,6 +7454,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7314,6 +7453,11 @@ static struct zt_pvt *mkintf(int channel
destroy_zt_pvt(&tmp);
return NULL;
}
@@ -582,7 +582,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);
-@@ -7332,6 +7476,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7331,6 +7475,11 @@ static struct zt_pvt *mkintf(int channel
return NULL;
}
pris[span].nodetype = conf.pri.nodetype;
@@ -594,7 +594,7 @@
pris[span].switchtype = myswitchtype;
pris[span].nsf = conf.pri.nsf;
pris[span].dialplan = conf.pri.dialplan;
-@@ -7340,9 +7489,13 @@ static struct zt_pvt *mkintf(int channel
+@@ -7339,9 +7488,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;
@@ -608,7 +608,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));
-@@ -7484,6 +7637,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7483,6 +7636,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;
@@ -616,7 +616,7 @@
tmp->priexclusive = conf.chan.priexclusive;
if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) {
-@@ -7766,7 +7920,7 @@ static int pri_find_empty_chan(struct zt
+@@ -7765,7 +7919,7 @@ static int pri_find_empty_chan(struct zt
break;
if (!backwards && (x >= pri->numchans))
break;
@@ -625,7 +625,7 @@
ast_log(LOG_DEBUG, "Found empty available channel %d/%d\n",
pri->pvts[x]->logicalspan, pri->pvts[x]->prioffset);
return x;
-@@ -7962,6 +8116,11 @@ static struct ast_channel *zt_request(co
+@@ -7961,6 +8115,11 @@ static struct ast_channel *zt_request(co
p->digital = 1;
if (tmp)
tmp->transfercapability = AST_TRANS_CAP_DIGITAL;
@@ -637,7 +637,7 @@
} else {
ast_log(LOG_WARNING, "Unknown option '%c' in '%s'\n", opt, (char *)data);
}
-@@ -7995,13 +8154,14 @@ next:
+@@ -7994,13 +8153,14 @@ next:
*cause = AST_CAUSE_BUSY;
} else if (groupmatched) {
*cause = AST_CAUSE_CONGESTION;
@@ -653,7 +653,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8046,6 +8206,7 @@ static int pri_find_principle(struct zt_
+@@ -8045,6 +8205,7 @@ static int pri_find_principle(struct zt_
static int pri_fixup_principle(struct zt_pri *pri, int principle, q931_call *c)
{
int x;
@@ -661,7 +661,7 @@
struct zt_pvt *crv;
if (!c) {
if (principle < 0)
-@@ -8076,6 +8237,7 @@ static int pri_fixup_principle(struct zt
+@@ -8075,6 +8236,7 @@ static int pri_fixup_principle(struct zt
}
/* Fix it all up now */
new->owner = old->owner;
@@ -669,7 +669,7 @@
old->owner = NULL;
if (new->owner) {
ast_string_field_build(new->owner, name,
-@@ -8095,6 +8257,34 @@ static int pri_fixup_principle(struct zt
+@@ -8094,6 +8256,34 @@ static int pri_fixup_principle(struct zt
new->dsp_features = old->dsp_features;
old->dsp = NULL;
old->dsp_features = 0;
@@ -704,7 +704,7 @@
}
return principle;
}
-@@ -8123,7 +8313,9 @@ static int pri_fixup_principle(struct zt
+@@ -8122,7 +8312,9 @@ static int pri_fixup_principle(struct zt
}
crv = crv->next;
}
@@ -715,7 +715,7 @@
return -1;
}
-@@ -8182,86 +8374,21 @@ static void *do_idle_thread(void *vchan)
+@@ -8181,86 +8373,21 @@ static void *do_idle_thread(void *vchan)
#ifndef PRI_RESTART
#error "Upgrade your libpri"
#endif
@@ -809,7 +809,7 @@
do {
pri->resetpos++;
} while ((pri->resetpos < pri->numchans) &&
-@@ -8345,13 +8472,30 @@ static void apply_plan_to_number(char *b
+@@ -8344,13 +8471,30 @@ static void apply_plan_to_number(char *b
}
}
@@ -847,7 +847,7 @@
}
static void *pri_dchannel(void *vpri)
-@@ -8531,15 +8675,44 @@ static void *pri_dchannel(void *vpri)
+@@ -8530,15 +8674,44 @@ static void *pri_dchannel(void *vpri)
/* Check for an event */
x = 0;
res = ioctl(pri->fds[which], ZT_GETEVENT, &x);
@@ -895,7 +895,7 @@
}
if (option_debug)
-@@ -8551,8 +8724,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8550,8 +8723,7 @@ static void *pri_dchannel(void *vpri)
break;
}
} else if (errno != EINTR)
@@ -905,7 +905,7 @@
if (e) {
if (pri->debug)
pri_dump_event(pri->dchans[which], e);
-@@ -8577,6 +8749,17 @@ static void *pri_dchannel(void *vpri)
+@@ -8576,6 +8748,17 @@ static void *pri_dchannel(void *vpri)
switch (e->e) {
case PRI_EVENT_DCHAN_UP:
@@ -923,7 +923,7 @@
if (!pri->pri) pri_find_dchan(pri);
/* Note presense of D-channel */
-@@ -8595,6 +8778,12 @@ static void *pri_dchannel(void *vpri)
+@@ -8594,6 +8777,12 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_DCHAN_DOWN:
@@ -936,7 +936,7 @@
pri_find_dchan(pri);
if (!pri_is_up(pri)) {
pri->resetting = 0;
-@@ -8602,16 +8791,18 @@ static void *pri_dchannel(void *vpri)
+@@ -8601,16 +8790,18 @@ static void *pri_dchannel(void *vpri)
for (i = 0; i < pri->numchans; i++) {
struct zt_pvt *p = pri->pvts[i];
if (p) {
@@ -956,7 +956,7 @@
if (p->realcall) {
pri_hangup_all(p->realcall, pri);
} else if (p->owner)
-@@ -8620,6 +8811,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8619,6 +8810,7 @@ static void *pri_dchannel(void *vpri)
p->inalarm = 1;
}
}
@@ -964,7 +964,7 @@
}
break;
case PRI_EVENT_RESTART:
-@@ -8654,8 +8846,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8653,8 +8845,8 @@ static void *pri_dchannel(void *vpri)
pri_destroycall(pri->pri, pri->pvts[x]->call);
pri->pvts[x]->call = NULL;
}
@@ -975,7 +975,7 @@
else if (pri->pvts[x]->owner)
pri->pvts[x]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_mutex_unlock(&pri->pvts[x]->lock);
-@@ -8689,7 +8881,6 @@ static void *pri_dchannel(void *vpri)
+@@ -8688,7 +8880,6 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -983,7 +983,7 @@
case PRI_EVENT_INFO_RECEIVED:
chanpos = pri_find_principle(pri, e->ring.channel);
if (chanpos < 0) {
-@@ -8698,9 +8889,11 @@ static void *pri_dchannel(void *vpri)
+@@ -8697,9 +8888,11 @@ static void *pri_dchannel(void *vpri)
} else {
chanpos = pri_fixup_principle(pri, chanpos, e->ring.call);
if (chanpos > -1) {
@@ -996,7 +996,7 @@
/* how to do that */
int digitlen = strlen(e->ring.callednum);
char digit;
-@@ -8712,6 +8905,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8711,6 +8904,14 @@ static void *pri_dchannel(void *vpri)
zap_queue_frame(pri->pvts[chanpos], &f, pri);
}
}
@@ -1011,7 +1011,7 @@
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
-@@ -8719,36 +8920,59 @@ static void *pri_dchannel(void *vpri)
+@@ -8718,36 +8919,59 @@ static void *pri_dchannel(void *vpri)
break;
case PRI_EVENT_RING:
crv = NULL;
@@ -1087,7 +1087,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));
-@@ -8762,13 +8986,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8761,13 +8985,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);
@@ -1103,7 +1103,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) {
-@@ -8793,34 +9018,82 @@ static void *pri_dchannel(void *vpri)
+@@ -8792,34 +9017,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);
@@ -1204,7 +1204,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)) {
-@@ -8839,19 +9112,36 @@ static void *pri_dchannel(void *vpri)
+@@ -8838,19 +9111,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);
@@ -1244,7 +1244,7 @@
/* Get the use_callingpres state */
pri->pvts[chanpos]->callingpres = e->ring.callingpres;
-@@ -8863,10 +9153,17 @@ static void *pri_dchannel(void *vpri)
+@@ -8862,10 +9152,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);
@@ -1262,7 +1262,7 @@
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
-@@ -8874,6 +9171,16 @@ static void *pri_dchannel(void *vpri)
+@@ -8873,6 +9170,16 @@ static void *pri_dchannel(void *vpri)
if (!ast_strlen_zero(e->ring.callingsubaddr)) {
pbx_builtin_setvar_helper(c, "CALLINGSUBADDR", e->ring.callingsubaddr);
}
@@ -1279,7 +1279,7 @@
if (e->ring.ani2 >= 0) {
snprintf(ani2str, 5, "%.2d", e->ring.ani2);
pbx_builtin_setvar_helper(c, "ANI2", ani2str);
-@@ -8897,8 +9204,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8896,8 +9203,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)
@@ -1290,7 +1290,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",
-@@ -8906,15 +9213,19 @@ static void *pri_dchannel(void *vpri)
+@@ -8905,15 +9212,19 @@ static void *pri_dchannel(void *vpri)
if (c)
ast_hangup(c);
else {
@@ -1311,7 +1311,7 @@
if (c) {
char calledtonstr[10];
-@@ -8941,26 +9252,43 @@ static void *pri_dchannel(void *vpri)
+@@ -8940,26 +9251,43 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->lock);
if (option_verbose > 2)
@@ -1359,7 +1359,7 @@
pri->pvts[chanpos]->call = NULL;
pri->pvts[chanpos]->exten[0] = '\0';
}
-@@ -8969,9 +9297,9 @@ static void *pri_dchannel(void *vpri)
+@@ -8968,9 +9296,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
if (e->ring.flexible)
@@ -1371,7 +1371,7 @@
}
break;
case PRI_EVENT_RINGING:
-@@ -8987,7 +9315,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8986,7 +9314,7 @@ static void *pri_dchannel(void *vpri)
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
if (ast_strlen_zero(pri->pvts[chanpos]->dop.dialstr)) {
@@ -1380,7 +1380,7 @@
pri->pvts[chanpos]->subs[SUB_REAL].needringing = 1;
pri->pvts[chanpos]->alerting = 1;
} else
-@@ -9019,9 +9347,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9018,9 +9346,16 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_PROGRESS:
@@ -1398,7 +1398,7 @@
#ifdef PRI_PROGRESS_MASK
if ((!pri->pvts[chanpos]->progress) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
#else
-@@ -9063,11 +9398,18 @@ static void *pri_dchannel(void *vpri)
+@@ -9062,11 +9397,18 @@ static void *pri_dchannel(void *vpri)
pri->pvts[chanpos]->progress = 1;
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
@@ -1417,7 +1417,7 @@
if (!pri->pvts[chanpos]->proceeding) {
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
-@@ -9092,6 +9434,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9091,6 +9433,7 @@ static void *pri_dchannel(void *vpri)
pri->pvts[chanpos]->proceeding = 1;
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
@@ -1425,7 +1425,7 @@
}
break;
case PRI_EVENT_FACNAME:
-@@ -9115,6 +9458,163 @@ static void *pri_dchannel(void *vpri)
+@@ -9114,6 +9457,163 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -1589,7 +1589,7 @@
case PRI_EVENT_ANSWER:
chanpos = pri_find_principle(pri, e->answer.channel);
if (chanpos < 0) {
-@@ -9127,6 +9627,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9126,6 +9626,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);
@@ -1597,7 +1597,7 @@
/* Now we can do call progress detection */
/* We changed this so it turns on the DSP no matter what... progress or no progress.
-@@ -9156,11 +9657,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9155,11 +9656,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) {
@@ -1615,7 +1615,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9217,20 +9723,29 @@ static void *pri_dchannel(void *vpri)
+@@ -9216,20 +9722,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 {
@@ -1652,7 +1652,7 @@
#ifdef SUPPORT_USERUSER
if (pri->pvts[chanpos]->owner && !ast_strlen_zero(e->hangup.useruserinfo)) {
-@@ -9243,8 +9758,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9242,8 +9757,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1664,7 +1664,7 @@
}
}
break;
-@@ -9254,15 +9770,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9253,15 +9769,23 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_HANGUP_REQ:
chanpos = pri_find_principle(pri, e->hangup.channel);
if (chanpos < 0) {
@@ -1691,7 +1691,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;
-@@ -9289,16 +9813,34 @@ static void *pri_dchannel(void *vpri)
+@@ -9288,16 +9812,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");
@@ -1730,7 +1730,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9312,9 +9854,27 @@ static void *pri_dchannel(void *vpri)
+@@ -9311,9 +9853,27 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1759,7 +1759,7 @@
break;
case PRI_EVENT_HANGUP_ACK:
chanpos = pri_find_principle(pri, e->hangup.channel);
-@@ -9326,6 +9886,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9325,6 +9885,7 @@ static void *pri_dchannel(void *vpri)
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
pri->pvts[chanpos]->call = NULL;
@@ -1767,7 +1767,7 @@
pri->pvts[chanpos]->resetting = 0;
if (pri->pvts[chanpos]->owner) {
if (option_verbose > 2)
-@@ -9432,10 +9993,22 @@ static void *pri_dchannel(void *vpri)
+@@ -9431,10 +9992,22 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->pvts[chanpos]->lock);
switch (e->notify.info) {
case PRI_NOTIFY_REMOTE_HOLD:
@@ -1790,7 +1790,7 @@
f.subclass = AST_CONTROL_UNHOLD;
zap_queue_frame(pri->pvts[chanpos], &f, pri);
break;
-@@ -9443,6 +10016,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9442,6 +10015,23 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
break;
@@ -1814,7 +1814,7 @@
default:
ast_log(LOG_DEBUG, "Event: %d\n", e->e);
}
-@@ -9504,7 +10094,7 @@ static int start_pri(struct zt_pri *pri)
+@@ -9503,7 +10093,7 @@ static int start_pri(struct zt_pri *pri)
pri->fds[i] = -1;
return -1;
}
@@ -1823,7 +1823,7 @@
/* Force overlap dial if we're doing GR-303! */
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial = 1;
-@@ -9572,39 +10162,77 @@ static char *complete_span_5(const char
+@@ -9571,39 +10161,77 @@ static char *complete_span_5(const char
static int handle_pri_set_debug_file(int fd, int argc, char **argv)
{
@@ -1919,7 +1919,7 @@
}
return RESULT_SUCCESS;
-@@ -9638,6 +10266,7 @@ static int handle_pri_debug(int fd, int
+@@ -9644,6 +10272,7 @@ static int handle_pri_debug(int fd, int
@@ -1927,7 +1927,7 @@
static int handle_pri_no_debug(int fd, int argc, char *argv[])
{
int span;
-@@ -9787,10 +10416,6 @@ static int handle_pri_show_debug(int fd,
+@@ -9793,10 +10422,6 @@ static int handle_pri_show_debug(int fd,
}
}
@@ -1938,7 +1938,7 @@
if (!count)
ast_cli(fd, "No debug set or no PRI running\n");
-@@ -9817,6 +10442,18 @@ static const char pri_show_spans_help[]
+@@ -9823,6 +10448,18 @@ static const char pri_show_spans_help[]
"Usage: pri show spans\n"
" Displays PRI Information\n";
@@ -1957,7 +1957,7 @@
static struct ast_cli_entry zap_pri_cli[] = {
{ { "pri", "debug", "span", NULL },
handle_pri_debug, "Enables PRI debugging on a span",
-@@ -9841,6 +10478,15 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9847,6 +10484,15 @@ static struct ast_cli_entry zap_pri_cli[
{ { "pri", "show", "debug", NULL },
handle_pri_show_debug, "Displays current PRI debug settings" },
@@ -1973,8 +1973,8 @@
{ { "pri", "set", "debug", "file", NULL },
handle_pri_set_debug_file, "Sends PRI debug output to the specified file" },
-@@ -9848,8 +10494,76 @@ static struct ast_cli_entry zap_pri_cli[
- handle_pri_set_debug_file, "Ends PRI debug output to file" },
+@@ -9859,8 +10505,76 @@ static struct ast_cli_entry zap_pri_cli[
+ #endif
};
+static char *zapCD_tdesc = "Call Deflection";
@@ -2050,7 +2050,7 @@
static int zap_destroy_channel(int fd, int argc, char **argv)
{
int channel;
-@@ -10430,8 +11144,11 @@ static int __unload_module(void)
+@@ -10441,8 +11155,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);
@@ -2062,7 +2062,7 @@
ast_manager_unregister( "ZapDialOffhook" );
ast_manager_unregister( "ZapHangup" );
ast_manager_unregister( "ZapTransfer" );
-@@ -10933,6 +11650,22 @@ static int process_zap(struct zt_chan_co
+@@ -10944,6 +11661,22 @@ static int process_zap(struct zt_chan_co
confp->chan.sig = SIG_GR303FXSKS;
confp->chan.radio = 0;
confp->pri.nodetype = PRI_CPE;
@@ -2085,7 +2085,7 @@
#endif
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
-@@ -11045,9 +11778,21 @@ static int process_zap(struct zt_chan_co
+@@ -11056,9 +11789,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;
@@ -2108,7 +2108,7 @@
} else if (!strcasecmp(v->name, "priexclusive")) {
confp->chan.priexclusive = ast_true(v->value);
} else if (!strcasecmp(v->name, "internationalprefix")) {
-@@ -11060,6 +11805,10 @@ static int process_zap(struct zt_chan_co
+@@ -11071,6 +11816,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));
@@ -2119,7 +2119,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -11076,6 +11825,8 @@ static int process_zap(struct zt_chan_co
+@@ -11087,6 +11836,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));
@@ -2128,7 +2128,7 @@
} else if (!strcasecmp(v->name, "overlapdial")) {
confp->pri.overlapdial = ast_true(v->value);
} else if (!strcasecmp(v->name, "pritimer")) {
-@@ -11377,6 +12128,7 @@ static int setup_zap(int reload)
+@@ -11389,6 +12140,7 @@ static int setup_zap(int reload)
#ifdef HAVE_PRI
if (!reload) {
for (x = 0; x < NUM_SPANS; x++) {
@@ -2136,7 +2136,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);
-@@ -11424,7 +12176,10 @@ static int load_module(void)
+@@ -11436,7 +12188,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));
@@ -2147,7 +2147,7 @@
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
memset(round_robin, 0, sizeof(round_robin));
-@@ -11458,6 +12213,7 @@ static int zt_sendtext(struct ast_channe
+@@ -11470,6 +12225,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Mon May 26 01:25:00 2008
@@ -92,7 +92,7 @@
.call = zt_call,
.hangup = zt_hangup,
.answer = zt_answer,
-@@ -1262,6 +1287,8 @@ static char *zap_sig2str(int sig)
+@@ -1262,6 +1289,8 @@ static char *zap_sig2str(int sig)
return "GR-303 with FXOKS";
case SIG_GR303FXSKS:
return "GR-303 with FXSKS";
@@ -101,7 +101,7 @@
case 0:
return "Pseudo";
default:
-@@ -1683,7 +1710,7 @@ static inline int zt_confmute(struct zt_
+@@ -1683,7 +1712,7 @@ static inline int zt_confmute(struct zt_
{
int x, y, res;
x = muted;
@@ -110,7 +110,7 @@
y = 1;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &y);
if (res)
-@@ -2098,6 +2125,25 @@ static int zt_call(struct ast_channel *a
+@@ -2098,6 +2127,25 @@ static int zt_call(struct ast_channel *a
p->dialdest[0] = '\0';
disable_dtmf_detect(p);
break;
@@ -136,7 +136,7 @@
default:
ast_log(LOG_DEBUG, "not yet implemented\n");
ast_mutex_unlock(&p->lock);
-@@ -2737,7 +2783,13 @@ static int zt_hangup(struct ast_channel
+@@ -2737,7 +2785,13 @@ static int zt_hangup(struct ast_channel
}
}
#endif
@@ -151,7 +151,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);
-@@ -2914,6 +2966,13 @@ static int zt_answer(struct ast_channel
+@@ -2914,6 +2968,13 @@ static int zt_answer(struct ast_channel
zt_train_ec(p);
break;
#endif
@@ -165,7 +165,7 @@
case 0:
ast_mutex_unlock(&p->lock);
return 0;
-@@ -7303,6 +7362,10 @@ static int pri_create_spanmap(int span,
+@@ -7302,6 +7363,10 @@ static int pri_create_spanmap(int span,
#endif
@@ -176,7 +176,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) */
-@@ -7531,6 +7594,37 @@ static struct zt_pvt *mkintf(int channel
+@@ -7530,6 +7595,37 @@ static struct zt_pvt *mkintf(int channel
tmp->prioffset = 0;
}
#endif
@@ -214,7 +214,7 @@
} else {
conf.chan.sig = tmp->sig;
conf.chan.radio = tmp->radio;
-@@ -7820,6 +7914,12 @@ static inline int available(struct zt_pv
+@@ -7819,6 +7915,12 @@ static inline int available(struct zt_pv
return 1;
}
#endif
@@ -227,7 +227,7 @@
if (!(p->radio || (p->oprmode < 0)))
{
if (!p->sig || (p->sig == SIG_FXSLS))
-@@ -8177,6 +8277,235 @@ next:
+@@ -8176,6 +8278,235 @@ next:
return tmp;
}
@@ -463,7 +463,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8451,6 +8780,18 @@ static void zt_pri_error(char *s, int sp
+@@ -8450,6 +8781,18 @@ static void zt_pri_error(char *s, int sp
ast_log(LOG_WARNING, "%d %s", span, s);
}
@@ -482,7 +482,7 @@
static int pri_check_restart(struct zt_pri *pri)
{
if ((pri->nodetype != PRI_NETWORK) && (pri->nodetype != PRI_CPE)) {
-@@ -10857,6 +11198,243 @@ static int app_zapInband(struct ast_chan
+@@ -10868,6 +11211,243 @@ static int app_zapInband(struct ast_chan
#endif /* HAVE_PRI */
@@ -726,7 +726,7 @@
static int app_zapEC(struct ast_channel *chan, void *data)
{
int res=-1;
-@@ -11478,6 +12056,12 @@ static int __unload_module(void)
+@@ -11489,6 +12069,12 @@ static int __unload_module(void)
ast_unregister_application(zapCD_app);
ast_unregister_application(zapInband_app);
#endif
@@ -739,7 +739,7 @@
ast_cli_unregister_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
ast_unregister_application(zapEC_app);
ast_manager_unregister( "ZapDialOffhook" );
-@@ -11998,6 +12582,11 @@ static int process_zap(struct zt_chan_co
+@@ -12009,6 +12595,11 @@ static int process_zap(struct zt_chan_co
confp->chan.radio = 0;
confp->pri.nodetype = BRI_CPE;
#endif
@@ -751,7 +751,7 @@
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
}
-@@ -12140,6 +12729,10 @@ static int process_zap(struct zt_chan_co
+@@ -12151,6 +12742,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));
@@ -762,7 +762,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -12494,6 +13087,10 @@ static int load_module(void)
+@@ -12506,6 +13101,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
@@ -773,7 +773,7 @@
res = setup_zap(0);
/* Make sure we can register our Zap channel type */
if (res)
-@@ -12512,6 +13109,12 @@ static int load_module(void)
+@@ -12524,6 +13123,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));
@@ -786,7 +786,7 @@
memset(round_robin, 0, sizeof(round_robin));
ast_manager_register( "ZapTransfer", 0, action_transfer, "Transfer Zap Channel" );
-@@ -12525,7 +13128,66 @@ static int load_module(void)
+@@ -12537,7 +13142,66 @@ static int load_module(void)
return res;
}
@@ -866,7 +866,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
--- a/configure
+++ b/configure
-@@ -25979,6 +25979,188 @@ echo "$as_me: *** without explicitly spe
+@@ -26600,6 +26600,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded Mon May 26 01:25:00 2008
@@ -1,6 +1,6 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -5144,7 +5144,7 @@ struct app_tmp {
+@@ -5146,7 +5146,7 @@ struct app_tmp {
};
/*! \brief run the application and free the descriptor once done */
@@ -50,7 +50,7 @@
int debugfd;
};
-@@ -7491,6 +7505,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7490,6 +7504,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));
-@@ -8175,6 +8190,58 @@ static struct zt_pvt *pri_find_crv(struc
+@@ -8174,6 +8189,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)
{
-@@ -9590,18 +9657,150 @@ static void *pri_dchannel(void *vpri)
+@@ -9589,18 +9656,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);
-@@ -9758,9 +9957,20 @@ static void *pri_dchannel(void *vpri)
+@@ -9757,9 +9956,20 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -298,7 +298,7 @@
}
}
break;
-@@ -9823,11 +10033,63 @@ static void *pri_dchannel(void *vpri)
+@@ -9822,11 +10032,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;
-@@ -9857,7 +10119,19 @@ static void *pri_dchannel(void *vpri)
+@@ -9856,7 +10118,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 @@
}
}
}
-@@ -10017,16 +10291,73 @@ static void *pri_dchannel(void *vpri)
+@@ -10016,16 +10290,73 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_FACILITY:
Modified: asterisk/trunk/debian/patches/debian-banner
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/debian-banner?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/debian-banner (original)
+++ asterisk/trunk/debian/patches/debian-banner Mon May 26 01:25:00 2008
@@ -3,7 +3,7 @@
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -145,6 +145,9 @@ int daemon(int, int); /* defined in lib
+@@ -151,6 +151,9 @@ int daemon(int, int); /* defined in lib
ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \
ast_verbose("License version 2 and other licenses; you are welcome to redistribute it under\n"); \
ast_verbose("certain conditions. Type 'core show license' for details.\n"); \
Modified: asterisk/trunk/debian/patches/feature-bridge
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/feature-bridge?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/feature-bridge (original)
+++ asterisk/trunk/debian/patches/feature-bridge Mon May 26 01:25:00 2008
@@ -61,7 +61,7 @@
return NULL;
}
-@@ -2371,6 +2393,125 @@ static int handle_showfeatures(int fd, i
+@@ -2389,6 +2411,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";
-@@ -3198,6 +3339,154 @@ static int load_config(void)
+@@ -3216,6 +3357,154 @@ static int load_config(void)
}
@@ -342,7 +342,7 @@
static int reload(void)
{
autoanswer_reregister_extensions();
-@@ -3208,6 +3497,8 @@ static int load_module(void)
+@@ -3226,6 +3515,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));
-@@ -3223,6 +3514,7 @@ static int load_module(void)
+@@ -3241,6 +3532,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);
-@@ -3243,9 +3535,11 @@ static int unload_module(void)
+@@ -3261,9 +3553,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=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Mon May 26 01:25:00 2008
@@ -9,7 +9,7 @@
--- a/main/Makefile
+++ b/main/Makefile
-@@ -130,13 +130,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+@@ -131,13 +131,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 \
-@@ -145,11 +138,7 @@ asterisk: $(OBJS) editline/libedit.a db1
+@@ -146,11 +139,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/pubkey_jnctn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/pubkey_jnctn?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn (original)
+++ asterisk/trunk/debian/patches/pubkey_jnctn Mon May 26 01:25:00 2008
@@ -23,7 +23,7 @@
+-----END PUBLIC KEY-----
--- a/Makefile
+++ b/Makefile
-@@ -467,8 +467,7 @@ bininstall: _all
+@@ -469,8 +469,7 @@ bininstall: _all installdirs $(SUBDIRS_I
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
Modified: asterisk/trunk/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-config?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-config (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-config Mon May 26 01:25:00 2008
@@ -23,7 +23,7 @@
#NOTIFY=ben at alkaloid.net # Who to notify about crashes
#EXEC=/path/to/somescript # Run this command if Asterisk crashes
MACHINE=`hostname` # To specify which machine has crashed when getting the mail
-@@ -77,7 +81,7 @@ ulimit -c unlimited
+@@ -85,7 +89,7 @@ ulimit -c unlimited
# Don't fork when running "safely"
#
ASTARGS=""
@@ -32,7 +32,7 @@
if [ -c /dev/tty${TTY} ]; then
TTY=tty${TTY}
elif [ -c /dev/vc/${TTY} ]; then
-@@ -117,7 +121,7 @@ run_asterisk()
+@@ -125,7 +129,7 @@ run_asterisk()
{
while :; do
Modified: asterisk/trunk/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-nobg?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-nobg Mon May 26 01:25:00 2008
@@ -20,7 +20,7 @@
# comment this line out to have this script _not_ kill all mpg123 processes when
# asterisk exits
-@@ -171,4 +172,8 @@ run_asterisk()
+@@ -179,4 +180,8 @@ run_asterisk()
done
}
Modified: asterisk/trunk/debian/patches/use-libpri-bristuffed
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/use-libpri-bristuffed?rev=5801&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/use-libpri-bristuffed (original)
+++ asterisk/trunk/debian/patches/use-libpri-bristuffed Mon May 26 01:25:00 2008
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -25650,18 +25650,18 @@ fi
+@@ -25862,18 +25862,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
-@@ -25670,8 +25670,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
+@@ -25882,8 +25882,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
-@@ -25679,7 +25679,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -25891,7 +25891,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"
-@@ -25711,15 +25711,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25923,15 +25923,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
-@@ -25752,25 +25752,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
+@@ -25964,25 +25964,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 ##
-@@ -25779,8 +25779,8 @@ _ASBOX
+@@ -25991,8 +25991,8 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -119,15 +119,15 @@
else
--- a/configure.ac
+++ b/configure.ac
-@@ -1210,7 +1210,7 @@ fi
+@@ -1232,7 +1232,7 @@ fi
AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
-AST_EXT_LIB_CHECK([PRI], [pri], [pri_keypad_facility], [libpri.h])
+AST_EXT_LIB_CHECK([PRI], [pri-bristuffed], [pri_keypad_facility], [bristuffed/libpri.h])
- if test "${USE_PWLIB}" != "no"; then
- if test -n "${PWLIB_DIR}"; then
+ AST_EXT_LIB_CHECK([PRI_VERSION], [pri], [pri_get_version], [libpri.h])
+
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -71,7 +71,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
More information about the Pkg-voip-commits
mailing list