[Pkg-voip-commits] r5988 - in /asterisk/trunk/debian/patches: ./ bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Jul 24 16:28:36 UTC 2008
Author: paravoid
Date: Thu Jul 24 16:28:36 2008
New Revision: 5988
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5988
Log:
Do a quilt refresh on all patches
Modified:
asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
asterisk/trunk/debian/patches/bristuff/ast-send-message
asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME
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/safe_asterisk-config
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=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Thu Jul 24 16:28:36 2008
@@ -241,7 +241,7 @@
} else {
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1342,7 +1342,7 @@ static void ast_quiet_chan(struct ast_ch
+@@ -1343,7 +1343,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);
-@@ -8593,7 +8593,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8599,7 +8599,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;
-@@ -12783,7 +12783,7 @@ static void handle_response(struct sip_p
+@@ -12787,7 +12787,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);
@@ -268,7 +268,7 @@
}
}
} else if (sipmethod == SIP_REGISTER)
-@@ -13036,7 +13036,7 @@ static void handle_response(struct sip_p
+@@ -13040,7 +13040,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" },
};
-@@ -2551,10 +2552,12 @@ int ast_manager_unregister(char *action)
+@@ -2592,10 +2593,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=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Thu Jul 24 16:28:36 2008
@@ -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.
-@@ -1427,6 +1430,49 @@ static int action_hangup(struct mansessi
+@@ -1430,6 +1433,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"
-@@ -2853,6 +2899,7 @@ int init_manager(void)
+@@ -2894,6 +2940,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/chan-iax2-hangup-cause
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause?rev=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause Thu Jul 24 16:28:36 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.
-@@ -3362,7 +3365,7 @@ static int iax2_hangup(struct ast_channe
+@@ -3373,7 +3376,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);
-@@ -3416,7 +3419,8 @@ static int iax2_setoption(struct ast_cha
+@@ -3427,7 +3430,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=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME (original)
+++ asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME Thu Jul 24 16:28:36 2008
@@ -10,7 +10,7 @@
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -2427,6 +2427,7 @@ static void ast_readconfig(void)
+@@ -2455,6 +2455,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) {
-@@ -2551,6 +2552,8 @@ static void ast_readconfig(void)
+@@ -2579,6 +2580,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/uniqueid-30-app-chanspy
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy?rev=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Thu Jul 24 16:28:36 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"
-@@ -456,7 +478,7 @@ static struct chanspy_ds *setup_chanspy_
+@@ -458,7 +480,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;
-@@ -465,6 +487,8 @@ redo:
+@@ -467,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);
@@ -54,7 +54,7 @@
else
this = ast_channel_walk_locked(last);
-@@ -485,7 +509,7 @@ redo:
+@@ -487,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,
@@ -63,7 +63,7 @@
{
char nameprefix[AST_NAME_STRLEN];
char peer_name[AST_NAME_STRLEN + 5];
-@@ -530,11 +554,11 @@ static int common_exec(struct ast_channe
+@@ -534,11 +558,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];
-@@ -733,7 +757,7 @@ static int chanspy_exec(struct ast_chann
+@@ -737,7 +761,7 @@ static int chanspy_exec(struct ast_chann
}
}
@@ -86,7 +86,7 @@
if (fd)
close(fd);
-@@ -818,7 +842,7 @@ static int extenspy_exec(struct ast_chan
+@@ -822,7 +846,7 @@ static int extenspy_exec(struct ast_chan
}
}
@@ -95,7 +95,7 @@
if (fd)
close(fd);
-@@ -831,14 +855,100 @@ static int extenspy_exec(struct ast_chan
+@@ -835,14 +859,100 @@ static int extenspy_exec(struct ast_chan
return res;
}
@@ -197,7 +197,7 @@
return res;
}
-@@ -849,6 +959,7 @@ static int load_module(void)
+@@ -853,6 +963,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=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Thu Jul 24 16:28:36 2008
@@ -9,7 +9,7 @@
struct ast_variable *vars;
};
-@@ -1416,11 +1418,20 @@ static int action_hangup(struct mansessi
+@@ -1419,11 +1421,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;
-@@ -1671,12 +1682,18 @@ static int action_redirect(struct manses
+@@ -1674,12 +1685,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)) {
-@@ -1685,8 +1702,18 @@ static int action_redirect(struct manses
+@@ -1688,8 +1705,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);
-@@ -1698,8 +1725,11 @@ static int action_redirect(struct manses
+@@ -1701,8 +1728,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);
-@@ -1708,9 +1738,9 @@ static int action_redirect(struct manses
+@@ -1711,9 +1741,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)
-@@ -1789,15 +1819,15 @@ static void *fast_originate(void *data)
+@@ -1830,15 +1860,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)
-@@ -1857,6 +1887,7 @@ static int action_originate(struct manse
+@@ -1898,6 +1928,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;
-@@ -1866,6 +1897,9 @@ static int action_originate(struct manse
+@@ -1907,6 +1938,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;
-@@ -1883,6 +1917,10 @@ static int action_originate(struct manse
+@@ -1924,6 +1958,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, '/');
-@@ -1902,6 +1940,7 @@ static int action_originate(struct manse
+@@ -1943,6 +1981,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) {
-@@ -1921,8 +1960,10 @@ static int action_originate(struct manse
+@@ -1962,8 +2001,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)) {
-@@ -1933,19 +1974,28 @@ static int action_originate(struct manse
+@@ -1974,19 +2015,28 @@ static int action_originate(struct manse
pthread_attr_destroy(&attr);
}
} else if (!ast_strlen_zero(app)) {
Modified: asterisk/trunk/debian/patches/bristuff/xagi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/xagi?rev=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/xagi (original)
+++ asterisk/trunk/debian/patches/bristuff/xagi Thu Jul 24 16:28:36 2008
@@ -215,7 +215,7 @@
} else {
if (--retry <= 0) {
ast_log(LOG_WARNING, "No channel, no fd?\n");
-@@ -2030,6 +2106,7 @@ static int agi_exec_full(struct ast_chan
+@@ -2034,6 +2110,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;
-@@ -2056,12 +2133,13 @@ static int agi_exec_full(struct ast_chan
+@@ -2060,12 +2137,13 @@ static int agi_exec_full(struct ast_chan
}
#endif
ast_replace_sigchld();
@@ -238,7 +238,7 @@
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 */
-@@ -2071,6 +2149,8 @@ static int agi_exec_full(struct ast_chan
+@@ -2075,6 +2153,8 @@ static int agi_exec_full(struct ast_chan
close(fds[1]);
if (efd > -1)
close(efd);
@@ -247,7 +247,7 @@
}
ast_unreplace_sigchld();
ast_module_user_remove(u);
-@@ -2119,6 +2199,35 @@ static int eagi_exec(struct ast_channel
+@@ -2123,6 +2203,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))
-@@ -2174,6 +2283,7 @@ static int unload_module(void)
+@@ -2178,6 +2287,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);
-@@ -2184,6 +2294,7 @@ static int load_module(void)
+@@ -2188,6 +2298,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=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Jul 24 16:28:36 2008
@@ -173,7 +173,7 @@
static inline int pri_grab(struct zt_pvt *pvt, struct zt_pri *pri)
{
int res;
-@@ -1417,12 +1449,16 @@ static void zt_enable_ec(struct zt_pvt *
+@@ -1410,12 +1442,16 @@ static void zt_enable_ec(struct zt_pvt *
int res;
if (!p)
return;
@@ -191,7 +191,7 @@
return;
}
if (p->echocancel) {
-@@ -1449,7 +1485,7 @@ static void zt_train_ec(struct zt_pvt *p
+@@ -1442,7 +1478,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)
-@@ -1810,7 +1846,12 @@ static int zt_call(struct ast_channel *a
+@@ -1803,7 +1839,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)
-@@ -2041,6 +2082,7 @@ static int zt_call(struct ast_channel *a
+@@ -2034,6 +2075,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");
-@@ -2061,6 +2103,12 @@ static int zt_call(struct ast_channel *a
+@@ -2054,6 +2096,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++;
-@@ -2083,6 +2131,7 @@ static int zt_call(struct ast_channel *a
+@@ -2076,6 +2124,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');
-@@ -2106,6 +2155,8 @@ static int zt_call(struct ast_channel *a
+@@ -2099,6 +2148,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);
-@@ -2135,7 +2186,7 @@ static int zt_call(struct ast_channel *a
+@@ -2131,7 +2182,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);
-@@ -2399,8 +2450,10 @@ static int pri_find_dchan(struct zt_pri
+@@ -2395,8 +2446,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",
-@@ -2410,6 +2463,16 @@ static int pri_find_dchan(struct zt_pri
+@@ -2406,6 +2459,16 @@ static int pri_find_dchan(struct zt_pri
}
#endif
@@ -290,7 +290,7 @@
static int zt_hangup(struct ast_channel *ast)
{
int res;
-@@ -2457,8 +2520,7 @@ static int zt_hangup(struct ast_channel
+@@ -2453,8 +2516,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;
-@@ -2560,6 +2622,7 @@ static int zt_hangup(struct ast_channel
+@@ -2556,6 +2618,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;
-@@ -2602,7 +2665,7 @@ static int zt_hangup(struct ast_channel
+@@ -2598,7 +2661,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;
-@@ -2622,7 +2685,28 @@ static int zt_hangup(struct ast_channel
+@@ -2618,7 +2681,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");
-@@ -2806,10 +2890,14 @@ static int zt_answer(struct ast_channel
+@@ -2802,10 +2886,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:
-@@ -3446,6 +3534,15 @@ static int zt_fixup(struct ast_channel *
+@@ -3436,6 +3524,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) {
-@@ -3655,8 +3752,10 @@ static void zt_handle_dtmfup(struct ast_
+@@ -3645,8 +3742,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)
-@@ -3815,7 +3914,7 @@ static struct ast_frame *zt_handle_event
+@@ -3805,7 +3904,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);
-@@ -4886,7 +4985,7 @@ static struct ast_frame *zt_read(struct
+@@ -4876,7 +4975,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) {
-@@ -4898,8 +4997,9 @@ static struct ast_frame *zt_read(struct
+@@ -4888,8 +4987,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;
}
-@@ -4974,7 +5074,9 @@ static int zt_write(struct ast_channel *
+@@ -4964,7 +5064,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;
}
-@@ -5042,7 +5144,7 @@ static int zt_indicate(struct ast_channe
+@@ -5032,7 +5134,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;
-@@ -5124,7 +5226,7 @@ static int zt_indicate(struct ast_channe
+@@ -5114,7 +5216,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;
-@@ -5321,8 +5423,12 @@ static struct ast_channel *zt_new(struct
+@@ -5311,8 +5413,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;
}
-@@ -5452,6 +5558,7 @@ static void *ss_thread(void *data)
+@@ -5442,6 +5548,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
-@@ -5480,10 +5587,17 @@ static void *ss_thread(void *data)
+@@ -5470,10 +5577,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)) {
@@ -492,7 +492,7 @@
if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num))
timeout = matchdigittimeout;
else
-@@ -6697,9 +6811,20 @@ static int handle_init_event(struct zt_p
+@@ -6687,9 +6801,20 @@ static int handle_init_event(struct zt_p
case ZT_EVENT_NOALARM:
i->inalarm = 0;
if (!i->unknown_alarm) {
@@ -513,7 +513,7 @@
} else {
i->unknown_alarm = 0;
}
-@@ -6708,7 +6833,13 @@ static int handle_init_event(struct zt_p
+@@ -6698,7 +6823,13 @@ static int handle_init_event(struct zt_p
i->inalarm = 1;
res = get_alarms(i);
do {
@@ -528,7 +528,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. */
-@@ -6724,6 +6855,10 @@ static int handle_init_event(struct zt_p
+@@ -6714,6 +6845,10 @@ static int handle_init_event(struct zt_p
"Alarm: %s\r\n"
"Channel: %d\r\n",
alarm_str, i->channel);
@@ -539,7 +539,7 @@
} while (0);
/* fall thru intentionally */
case ZT_EVENT_ONHOOK:
-@@ -6768,8 +6903,10 @@ static int handle_init_event(struct zt_p
+@@ -6758,8 +6893,10 @@ static int handle_init_event(struct zt_p
zt_set_hook(i->subs[SUB_REAL].zfd, ZT_ONHOOK);
break;
case SIG_PRI:
@@ -552,7 +552,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);
-@@ -7062,6 +7199,8 @@ static int pri_resolve_span(int *span, i
+@@ -7052,6 +7189,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;
@@ -561,7 +561,7 @@
} else {
pris[*span].dchannels[0] = 24 + offset;
}
-@@ -7314,6 +7453,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7305,6 +7444,11 @@ static struct zt_pvt *mkintf(int channel
destroy_zt_pvt(&tmp);
return NULL;
}
@@ -573,7 +573,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);
-@@ -7331,6 +7475,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7322,6 +7466,11 @@ static struct zt_pvt *mkintf(int channel
return NULL;
}
pris[span].nodetype = conf->pri.nodetype;
@@ -585,7 +585,7 @@
pris[span].switchtype = myswitchtype;
pris[span].nsf = conf->pri.nsf;
pris[span].dialplan = conf->pri.dialplan;
-@@ -7339,9 +7488,13 @@ static struct zt_pvt *mkintf(int channel
+@@ -7330,9 +7479,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;
@@ -599,7 +599,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));
-@@ -7483,6 +7636,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7485,6 +7638,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;
@@ -607,7 +607,7 @@
tmp->priexclusive = conf->chan.priexclusive;
if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) {
-@@ -7765,7 +7919,7 @@ static int pri_find_empty_chan(struct zt
+@@ -7767,7 +7921,7 @@ static int pri_find_empty_chan(struct zt
break;
if (!backwards && (x >= pri->numchans))
break;
@@ -616,7 +616,7 @@
ast_log(LOG_DEBUG, "Found empty available channel %d/%d\n",
pri->pvts[x]->logicalspan, pri->pvts[x]->prioffset);
return x;
-@@ -7961,6 +8115,11 @@ static struct ast_channel *zt_request(co
+@@ -7963,6 +8117,11 @@ static struct ast_channel *zt_request(co
p->digital = 1;
if (tmp)
tmp->transfercapability = AST_TRANS_CAP_DIGITAL;
@@ -628,7 +628,7 @@
} else {
ast_log(LOG_WARNING, "Unknown option '%c' in '%s'\n", opt, (char *)data);
}
-@@ -7994,13 +8153,14 @@ next:
+@@ -7996,13 +8155,14 @@ next:
*cause = AST_CAUSE_BUSY;
} else if (groupmatched) {
*cause = AST_CAUSE_CONGESTION;
@@ -644,7 +644,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8045,6 +8205,7 @@ static int pri_find_principle(struct zt_
+@@ -8047,6 +8207,7 @@ static int pri_find_principle(struct zt_
static int pri_fixup_principle(struct zt_pri *pri, int principle, q931_call *c)
{
int x;
@@ -652,7 +652,7 @@
struct zt_pvt *crv;
if (!c) {
if (principle < 0)
-@@ -8075,6 +8236,7 @@ static int pri_fixup_principle(struct zt
+@@ -8077,6 +8238,7 @@ static int pri_fixup_principle(struct zt
}
/* Fix it all up now */
new->owner = old->owner;
@@ -660,7 +660,7 @@
old->owner = NULL;
if (new->owner) {
ast_string_field_build(new->owner, name,
-@@ -8094,6 +8256,34 @@ static int pri_fixup_principle(struct zt
+@@ -8096,6 +8258,34 @@ static int pri_fixup_principle(struct zt
new->dsp_features = old->dsp_features;
old->dsp = NULL;
old->dsp_features = 0;
@@ -695,7 +695,7 @@
}
return principle;
}
-@@ -8122,7 +8312,9 @@ static int pri_fixup_principle(struct zt
+@@ -8124,7 +8314,9 @@ static int pri_fixup_principle(struct zt
}
crv = crv->next;
}
@@ -706,7 +706,7 @@
return -1;
}
-@@ -8181,86 +8373,21 @@ static void *do_idle_thread(void *vchan)
+@@ -8183,86 +8375,21 @@ static void *do_idle_thread(void *vchan)
#ifndef PRI_RESTART
#error "Upgrade your libpri"
#endif
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Thu Jul 24 16:28:36 2008
@@ -35,7 +35,7 @@
/*! \brief Avoid the silly zt_getevent which ignores a bunch of events */
static inline int zt_get_event(int fd)
-@@ -364,6 +371,19 @@ struct zt_pri {
+@@ -350,6 +357,19 @@ struct zt_pri {
int debugfd;
};
@@ -55,7 +55,7 @@
static struct zt_pri pris[NUM_SPANS];
-@@ -392,6 +412,7 @@ struct zt_pri;
+@@ -378,6 +398,7 @@ struct zt_pri;
#define POLARITY_REV 1
@@ -63,7 +63,7 @@
static struct zt_distRings drings;
struct distRingData {
-@@ -604,6 +625,9 @@ static struct zt_pvt {
+@@ -590,6 +611,9 @@ static struct zt_pvt {
int prioffset;
int logicalspan;
#endif
@@ -73,7 +73,7 @@
int polarity;
int dsp_features;
char begindigit;
-@@ -710,7 +734,7 @@ static struct zt_chan_conf zt_chan_conf_
+@@ -696,7 +720,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);
@@ -82,7 +82,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);
-@@ -732,6 +756,9 @@ static const struct ast_channel_tech zap
+@@ -718,6 +742,9 @@ static const struct ast_channel_tech zap
.send_digit_begin = zt_digit_begin,
.send_digit_end = zt_digit_end,
.send_text = zt_sendtext,
@@ -92,7 +92,7 @@
.call = zt_call,
.hangup = zt_hangup,
.answer = zt_answer,
-@@ -1262,6 +1289,8 @@ static char *zap_sig2str(int sig)
+@@ -1241,6 +1268,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 +1712,7 @@ static inline int zt_confmute(struct zt_
+@@ -1662,7 +1691,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 +2127,25 @@ static int zt_call(struct ast_channel *a
+@@ -2077,6 +2106,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 +2785,13 @@ static int zt_hangup(struct ast_channel
+@@ -2719,7 +2767,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 +2968,13 @@ static int zt_answer(struct ast_channel
+@@ -2896,6 +2950,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;
-@@ -7302,6 +7363,10 @@ static int pri_create_spanmap(int span,
+@@ -7278,6 +7339,10 @@ static int pri_create_spanmap(int span,
#endif
@@ -176,7 +176,7 @@
static struct zt_pvt *mkintf(int channel, const 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) */
-@@ -7530,6 +7595,37 @@ static struct zt_pvt *mkintf(int channel
+@@ -7506,6 +7571,37 @@ static struct zt_pvt *mkintf(int channel
tmp->prioffset = 0;
}
#endif
@@ -212,9 +212,9 @@
+ }
+#endif
} else {
- conf->chan.sig = tmp->sig;
- conf->chan.radio = tmp->radio;
-@@ -7819,6 +7915,12 @@ static inline int available(struct zt_pv
+ chan_sig = tmp->sig;
+ memset(&p, 0, sizeof(p));
+@@ -7806,6 +7902,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))
-@@ -8176,6 +8278,235 @@ next:
+@@ -8163,6 +8265,235 @@ next:
return tmp;
}
@@ -463,7 +463,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8450,6 +8781,18 @@ static void zt_pri_error(char *s, int sp
+@@ -8385,6 +8716,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)) {
-@@ -10868,6 +11211,243 @@ static int app_zapInband(struct ast_chan
+@@ -10537,6 +10880,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;
-@@ -11489,6 +12069,12 @@ static int __unload_module(void)
+@@ -11158,6 +11738,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" );
-@@ -12009,6 +12595,11 @@ static int process_zap(struct zt_chan_co
+@@ -11678,6 +12264,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);
}
-@@ -12151,6 +12742,10 @@ static int process_zap(struct zt_chan_co
+@@ -11820,6 +12411,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;
-@@ -12506,6 +13101,10 @@ static int load_module(void)
+@@ -12175,6 +12770,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)
-@@ -12524,6 +13123,12 @@ static int load_module(void)
+@@ -12193,6 +12792,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" );
-@@ -12537,7 +13142,66 @@ static int load_module(void)
+@@ -12206,7 +12811,66 @@ static int load_module(void)
return res;
}
Modified: asterisk/trunk/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-config?rev=5988&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-config (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-config Thu Jul 24 16:28:36 2008
@@ -8,7 +8,7 @@
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
@@ -1,9 +1,13 @@
- #!/bin/bash
+ #!/bin/sh
# vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
+if [ -f /etc/default/asterisk ]; then
More information about the Pkg-voip-commits
mailing list