[Pkg-voip-commits] r5109 - in /asterisk/trunk/debian/patches: ./ bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Dec 20 05:37:01 UTC 2007
Author: paravoid
Date: Thu Dec 20 05:37:00 2007
New Revision: 5109
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5109
Log:
Do a quilt refesh on all patches (huge & ugly diff)
Modified:
asterisk/trunk/debian/patches/astvarrundir
asterisk/trunk/debian/patches/bristuff/answer-before-say
asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
asterisk/trunk/debian/patches/bristuff/app-dial-etc
asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows
asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
asterisk/trunk/debian/patches/bristuff/ast-send-message
asterisk/trunk/debian/patches/bristuff/ast-send-message-users
asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
asterisk/trunk/debian/patches/bristuff/feature-autoanswer
asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation
asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata-device-state
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/configure-libc-client
asterisk/trunk/debian/patches/fix-chan-iax2-segfault
asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
asterisk/trunk/debian/patches/make-clean-fixes
asterisk/trunk/debian/patches/pubkey_jnctn
asterisk/trunk/debian/patches/tos-libcap
asterisk/trunk/debian/patches/vpb-driver-4.2.18
Modified: asterisk/trunk/debian/patches/astvarrundir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/astvarrundir?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/astvarrundir (original)
+++ asterisk/trunk/debian/patches/astvarrundir Thu Dec 20 05:37:00 2007
@@ -7,7 +7,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -122,7 +122,7 @@ else
+@@ -123,7 +123,7 @@ else
ASTSBINDIR=$(sbindir)
ASTSPOOLDIR=$(localstatedir)/spool/asterisk
ASTLOGDIR=$(localstatedir)/log/asterisk
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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/trunk/debian/patches/bristuff/answer-before-say Thu Dec 20 05:37:00 2007
@@ -3,7 +3,7 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -6064,6 +6064,9 @@ static int pbx_builtin_saynumber(struct
+@@ -6054,6 +6054,9 @@ static int pbx_builtin_saynumber(struct
return -1;
}
}
@@ -13,7 +13,7 @@
return ast_say_number(chan, atoi(tmp), "", chan->language, options);
}
-@@ -6071,8 +6074,12 @@ static int pbx_builtin_saydigits(struct
+@@ -6061,8 +6064,12 @@ static int pbx_builtin_saydigits(struct
{
int res = 0;
@@ -27,7 +27,7 @@
return res;
}
-@@ -6080,8 +6087,12 @@ static int pbx_builtin_saycharacters(str
+@@ -6070,8 +6077,12 @@ static int pbx_builtin_saycharacters(str
{
int res = 0;
@@ -41,7 +41,7 @@
return res;
}
-@@ -6089,8 +6100,12 @@ static int pbx_builtin_sayphonetic(struc
+@@ -6079,8 +6090,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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband Thu Dec 20 05:37:00 2007
@@ -1,6 +1,6 @@
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
-@@ -192,6 +192,8 @@ static char *descrip =
+@@ -193,6 +193,8 @@ static char *descrip =
" family/key is not specified.\n"
" r - Indicate ringing to the calling party. Pass no audio to the calling\n"
" party until the called channel has answered.\n"
@@ -9,7 +9,7 @@
" S(x) - Hang up the call after 'x' seconds *after* the called party has\n"
" answered the call.\n"
" t - Allow the called party to transfer the calling party by sending the\n"
-@@ -248,6 +250,7 @@ enum {
+@@ -249,6 +251,7 @@ enum {
OPT_CALLEE_PARK = (1 << 25),
OPT_CALLER_PARK = (1 << 26),
OPT_IGNORE_FORWARDING = (1 << 27),
@@ -17,7 +17,7 @@
} dial_exec_option_flags;
#define DIAL_STILLGOING (1 << 30)
-@@ -291,6 +294,7 @@ AST_APP_OPTIONS(dial_exec_options, {
+@@ -292,6 +295,7 @@ AST_APP_OPTIONS(dial_exec_options, {
AST_APP_OPTION('p', OPT_SCREENING),
AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY),
AST_APP_OPTION('r', OPT_RINGBACK),
@@ -25,7 +25,7 @@
AST_APP_OPTION_ARG('S', OPT_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION('t', OPT_CALLEE_TRANSFER),
AST_APP_OPTION('T', OPT_CALLER_TRANSFER),
-@@ -409,7 +413,7 @@ static struct ast_channel *wait_for_answ
+@@ -407,7 +411,7 @@ static struct ast_channel *wait_for_answ
int orig = *to;
struct ast_channel *peer = NULL;
/* single is set if only one destination is enabled */
@@ -34,7 +34,7 @@
if (single) {
/* Turn off hold music, etc */
-@@ -637,7 +641,7 @@ static struct ast_channel *wait_for_answ
+@@ -628,7 +632,7 @@ static struct ast_channel *wait_for_answ
/* Setup early media if appropriate */
if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
@@ -43,7 +43,7 @@
ast_indicate(in, AST_CONTROL_PROGRESS);
break;
case AST_CONTROL_VIDUPDATE:
-@@ -650,7 +654,7 @@ static struct ast_channel *wait_for_answ
+@@ -641,7 +645,7 @@ static struct ast_channel *wait_for_answ
ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
@@ -52,7 +52,7 @@
ast_indicate(in, AST_CONTROL_PROCEEDING);
break;
case AST_CONTROL_HOLD:
-@@ -668,7 +672,7 @@ static struct ast_channel *wait_for_answ
+@@ -659,7 +663,7 @@ static struct ast_channel *wait_for_answ
/* Ignore going off hook and flash */
break;
case -1:
@@ -61,7 +61,7 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "%s stopped sounds\n", c->name);
ast_indicate(in, -1);
-@@ -1106,7 +1110,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1099,7 +1103,7 @@ static int dial_exec_full(struct ast_cha
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
}
@@ -70,7 +70,7 @@
/* loop through the list of dial destinations */
rest = args.peers;
while ((cur = strsep(&rest, "&")) ) {
-@@ -1126,7 +1130,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1124,7 +1128,7 @@ static int dial_exec_full(struct ast_cha
OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
OPT_CALLEE_PARK | OPT_CALLER_PARK |
@@ -79,7 +79,7 @@
ast_set2_flag(tmp, args.url, DIAL_NOFORWARDHTML);
}
ast_copy_string(numsubst, number, sizeof(numsubst));
-@@ -1306,7 +1310,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1327,7 +1331,7 @@ static int dial_exec_full(struct ast_cha
ast_moh_start(chan, NULL, NULL);
}
ast_indicate(chan, AST_CONTROL_PROGRESS);
@@ -88,7 +88,7 @@
ast_indicate(chan, AST_CONTROL_RINGING);
sentringing++;
}
-@@ -1421,7 +1425,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1444,7 +1448,7 @@ static int dial_exec_full(struct ast_cha
if (ast_test_flag(&opts, OPT_MUSICBACK)) {
ast_moh_stop(chan);
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-c-callback?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-c-callback (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-c-callback Thu Dec 20 05:37:00 2007
@@ -1,6 +1,6 @@
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
-@@ -195,7 +195,8 @@ static char *descrip =
+@@ -196,7 +196,8 @@ static char *descrip =
" R - indicate ringing to the calling party when the called party indicates\n"
" ringing, pass no audio until answered.\n"
" S(x) - Hang up the call after 'x' seconds *after* the called party has\n"
@@ -10,7 +10,7 @@
" t - Allow the called party to transfer the calling party by sending the\n"
" DTMF sequence defined in features.conf.\n"
" T - Allow the calling party to transfer the called party by sending the\n"
-@@ -251,6 +252,7 @@ enum {
+@@ -252,6 +253,7 @@ enum {
OPT_CALLER_PARK = (1 << 26),
OPT_IGNORE_FORWARDING = (1 << 27),
OPT_NOINBAND = (1 << 28),
@@ -18,7 +18,7 @@
} dial_exec_option_flags;
#define DIAL_STILLGOING (1 << 30)
-@@ -295,6 +297,7 @@ AST_APP_OPTIONS(dial_exec_options, {
+@@ -296,6 +298,7 @@ AST_APP_OPTIONS(dial_exec_options, {
AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY),
AST_APP_OPTION('r', OPT_RINGBACK),
AST_APP_OPTION('R', OPT_NOINBAND),
@@ -26,7 +26,7 @@
AST_APP_OPTION_ARG('S', OPT_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION('t', OPT_CALLEE_TRANSFER),
AST_APP_OPTION('T', OPT_CALLER_TRANSFER),
-@@ -625,14 +628,20 @@ static struct ast_channel *wait_for_answ
+@@ -616,14 +619,20 @@ static struct ast_channel *wait_for_answ
HANDLE_CAUSE(AST_CAUSE_CONGESTION, in);
break;
case AST_CONTROL_RINGING:
@@ -51,7 +51,7 @@
}
break;
case AST_CONTROL_PROGRESS:
-@@ -1110,7 +1119,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1103,7 +1112,7 @@ static int dial_exec_full(struct ast_cha
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
}
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-etc
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-etc?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-etc (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-etc Thu Dec 20 05:37:00 2007
@@ -1,6 +1,6 @@
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
-@@ -65,6 +65,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -66,6 +66,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include "asterisk/privacy.h"
#include "asterisk/stringfields.h"
#include "asterisk/global_datastores.h"
@@ -8,7 +8,7 @@
static char *app = "Dial";
-@@ -1629,23 +1630,25 @@ static int dial_exec_full(struct ast_cha
+@@ -1654,23 +1655,25 @@ static int dial_exec_full(struct ast_cha
ast_set_flag(&(config.features_caller), AST_FEATURE_PLAY_WARNING);
if (play_to_callee)
ast_set_flag(&(config.features_callee), AST_FEATURE_PLAY_WARNING);
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-priority-202?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 Thu Dec 20 05:37:00 2007
@@ -11,7 +11,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.
-@@ -124,7 +128,8 @@ static char *descrip =
+@@ -125,7 +129,8 @@ static char *descrip =
" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n"
" i - Asterisk will ignore any forwarding requests it may receive on this\n"
" dial attempt.\n"
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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows (original)
+++ asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows Thu Dec 20 05:37:00 2007
@@ -9,9 +9,9 @@
- char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
+ char __buf[ZT_MAX_BUF_SPACE / ZT_DEFAULT_NUM_BUFS + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;
+ int setusercount = 0;
- if (!(user = ast_calloc(1, sizeof(*user))))
-@@ -1598,7 +1599,7 @@ static int conf_run(struct ast_channel *
+@@ -1604,7 +1605,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;
-@@ -1907,6 +1908,14 @@ static int conf_run(struct ast_channel *
+@@ -1913,6 +1914,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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Thu Dec 20 05:37:00 2007
@@ -113,7 +113,7 @@
} else {
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -582,8 +582,13 @@ int ast_channel_datastore_remove(struct
+@@ -590,8 +590,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);
@@ -130,7 +130,7 @@
\return Returns NULL on failure to allocate.
--- a/main/channel.c
+++ b/main/channel.c
-@@ -1270,7 +1270,7 @@ void ast_channel_free(struct ast_channel
+@@ -1274,7 +1274,7 @@ void ast_channel_free(struct ast_channel
free(chan);
AST_LIST_UNLOCK(&channels);
@@ -139,7 +139,7 @@
}
struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid)
-@@ -3910,7 +3910,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3938,7 +3938,7 @@ void ast_set_callerid(struct ast_channel
ast_channel_unlock(chan);
}
@@ -148,7 +148,7 @@
{
int oldstate = chan->_state;
-@@ -3918,7 +3918,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3946,7 +3946,7 @@ int ast_setstate(struct ast_channel *cha
return 0;
chan->_state = state;
@@ -157,7 +157,7 @@
/* setstate used to conditionally report Newchannel; this is no more */
manager_event(EVENT_FLAG_CALL,
"Newstate",
-@@ -3935,6 +3935,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3963,6 +3963,11 @@ int ast_setstate(struct ast_channel *cha
return 0;
}
@@ -191,7 +191,7 @@
}
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -2017,7 +2017,7 @@ int ast_extension_state(struct ast_chann
+@@ -2007,7 +2007,7 @@ int ast_extension_state(struct ast_chann
return ast_extension_state2(e); /* Check all devices in the hint */
}
@@ -200,7 +200,7 @@
{
struct ast_hint *hint;
-@@ -2049,11 +2049,11 @@ void ast_hint_state_changed(const char *
+@@ -2039,11 +2039,11 @@ void ast_hint_state_changed(const char *
/* For general callbacks */
for (cblist = statecbs; cblist; cblist = cblist->next)
@@ -214,7 +214,7 @@
hint->laststate = state; /* record we saw the change */
}
-@@ -2249,7 +2249,7 @@ static int ast_remove_hint(struct ast_ex
+@@ -2239,7 +2239,7 @@ static int ast_remove_hint(struct ast_ex
/* Notify with -1 and remove all callbacks */
cbprev = cblist;
cblist = cblist->next;
@@ -223,7 +223,7 @@
free(cbprev);
}
hint->callbacks = NULL;
-@@ -4012,7 +4012,7 @@ void ast_merge_contexts_and_delete(struc
+@@ -4002,7 +4002,7 @@ void ast_merge_contexts_and_delete(struc
while (thiscb) {
prevcb = thiscb;
thiscb = thiscb->next;
@@ -234,7 +234,7 @@
} else {
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1333,7 +1333,7 @@ static void ast_quiet_chan(struct ast_ch
+@@ -1338,7 +1338,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 */
@@ -243,7 +243,7 @@
static int sip_devicestate(void *data);
static int sip_poke_noanswer(const void *data);
static int sip_poke_peer(struct sip_peer *peer);
-@@ -8422,7 +8422,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8463,7 +8463,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 */
@@ -254,7 +254,7 @@
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
-@@ -676,7 +676,7 @@ static void *device_state_thread(void *d
+@@ -682,7 +682,7 @@ static void *device_state_thread(void *d
return NULL;
}
@@ -283,7 +283,7 @@
{ -1, "all" },
{ 0, "none" },
};
-@@ -2526,10 +2527,12 @@ int ast_manager_unregister(char *action)
+@@ -2524,10 +2525,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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Thu Dec 20 05:37:00 2007
@@ -3,7 +3,7 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -224,7 +224,7 @@ struct ast_channel_tech {
+@@ -227,7 +227,7 @@ struct ast_channel_tech {
int (* const write)(struct ast_channel *chan, struct ast_frame *frame);
/*! \brief Display or transmit text */
@@ -12,7 +12,7 @@
/*! \brief Display or send an image */
int (* const send_image)(struct ast_channel *chan, struct ast_frame *frame);
-@@ -663,6 +663,16 @@ struct ast_channel *ast_request_and_dial
+@@ -671,6 +671,16 @@ struct ast_channel *ast_request_and_dial
struct ast_channel *__ast_request_and_dial(const char *type, int format, void *data, int timeout, int *reason, const char *cidnum, const char *cidname, struct outgoing_helper *oh);
@@ -29,7 +29,7 @@
/*!\brief Register a channel technology (a new channel driver)
* Called by a channel module to register the kind of channels it supports.
* \param tech Structure defining channel technology or "type"
-@@ -879,10 +889,12 @@ int ast_set_write_format(struct ast_chan
+@@ -887,10 +897,12 @@ int ast_set_write_format(struct ast_chan
/*! \brief Sends text to a channel
* Write text to a display on a channel
* \param chan channel to act upon
@@ -45,7 +45,7 @@
* \param chan channel to act upon
--- a/main/channel.c
+++ b/main/channel.c
-@@ -2666,7 +2666,7 @@ char *ast_recvtext(struct ast_channel *c
+@@ -2691,7 +2691,7 @@ char *ast_recvtext(struct ast_channel *c
return buf;
}
@@ -54,7 +54,7 @@
{
int res = 0;
/* Stop if we're a zombie or need a soft hangup */
-@@ -2674,7 +2674,7 @@ int ast_sendtext(struct ast_channel *cha
+@@ -2699,7 +2699,7 @@ int ast_sendtext(struct ast_channel *cha
return -1;
CHECK_BLOCKING(chan);
if (chan->tech->send_text)
@@ -63,7 +63,7 @@
ast_clear_flag(chan, AST_FLAG_BLOCKING);
return res;
}
-@@ -2843,7 +2843,7 @@ int ast_write(struct ast_channel *chan,
+@@ -2878,7 +2878,7 @@ int ast_write(struct ast_channel *chan,
break;
case AST_FRAME_TEXT:
res = (chan->tech->send_text == NULL) ? 0 :
@@ -72,7 +72,7 @@
break;
case AST_FRAME_HTML:
res = (chan->tech->send_html == NULL) ? 0 :
-@@ -4874,6 +4874,25 @@ void ast_channel_stop_silence_generator(
+@@ -4902,6 +4902,25 @@ void ast_channel_stop_silence_generator(
}
@@ -229,7 +229,7 @@
return phone_write_buf(ast->tech_pvt, text, length, length, 0) ==
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1209,7 +1209,7 @@ static struct ast_config *notify_types;
+@@ -1215,7 +1215,7 @@ static struct ast_config *notify_types;
/*--- PBX interface functions */
static struct ast_channel *sip_request_call(const char *type, int format, void *data, int *cause);
static int sip_devicestate(void *data);
@@ -238,7 +238,7 @@
static int sip_call(struct ast_channel *ast, char *dest, int timeout);
static int sip_hangup(struct ast_channel *ast);
static int sip_answer(struct ast_channel *ast);
-@@ -2342,7 +2342,7 @@ static char *get_in_brackets(char *tmp)
+@@ -2347,7 +2347,7 @@ static char *get_in_brackets(char *tmp)
/*! \brief Send SIP MESSAGE text within a call
Called from PBX core sendtext() application */
@@ -249,7 +249,7 @@
int debug = sip_debug_test_pvt(p);
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
-@@ -830,7 +830,7 @@ static int iax2_provision(struct sockadd
+@@ -831,7 +831,7 @@ static int iax2_provision(struct sockadd
static int iax2_send(struct chan_iax2_pvt *pvt, struct ast_frame *f, unsigned int ts, int seqno, int now, int transfer, int final);
static int iax2_sendhtml(struct ast_channel *c, int subclass, const char *data, int datalen);
static int iax2_sendimage(struct ast_channel *c, struct ast_frame *img);
@@ -258,7 +258,7 @@
static int iax2_setoption(struct ast_channel *c, int option, void *data, int datalen);
static int iax2_transfer(struct ast_channel *c, const char *dest);
static int iax2_write(struct ast_channel *c, struct ast_frame *f);
-@@ -2639,7 +2639,7 @@ static int iax2_digit_end(struct ast_cha
+@@ -2642,7 +2642,7 @@ static int iax2_digit_end(struct ast_cha
return send_command_locked(PTR_TO_CALLNO(c->tech_pvt), AST_FRAME_DTMF_END, digit, 0, NULL, 0, -1);
}
Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message-users
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-send-message-users?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message-users (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message-users Thu Dec 20 05:37:00 2007
@@ -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.
-@@ -1428,6 +1431,49 @@ static int action_hangup(struct mansessi
+@@ -1426,6 +1429,49 @@ static int action_hangup(struct mansessi
return 0;
}
@@ -60,7 +60,7 @@
static char mandescr_setvar[] =
"Description: Set a global or local channel variable.\n"
"Variables: (Names marked with * are required)\n"
-@@ -2823,6 +2869,7 @@ int init_manager(void)
+@@ -2821,6 +2867,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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript Thu Dec 20 05:37:00 2007
@@ -95,7 +95,7 @@
ast_channel_unlock(c);
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
-@@ -2713,13 +2713,13 @@ static int try_calling(struct queue_ent
+@@ -2789,13 +2789,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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause Thu Dec 20 05:37:00 2007
@@ -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.
-@@ -3179,7 +3182,7 @@ static int iax2_hangup(struct ast_channe
+@@ -3240,7 +3243,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);
-@@ -3232,7 +3235,8 @@ static int iax2_setoption(struct ast_cha
+@@ -3294,7 +3297,8 @@ static int iax2_setoption(struct ast_cha
static struct ast_frame *iax2_read(struct ast_channel *c)
{
Modified: asterisk/trunk/debian/patches/bristuff/feature-autoanswer
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-autoanswer?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-autoanswer (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-autoanswer Thu Dec 20 05:37:00 2007
@@ -83,7 +83,7 @@
);
if (peer && adsipark && ast_adsi_available(peer)) {
-@@ -1626,11 +1663,13 @@ static void post_manager_event(const cha
+@@ -1629,11 +1666,13 @@ static void post_manager_event(const cha
"Exten: %s\r\n"
"Channel: %s\r\n"
"CallerID: %s\r\n"
@@ -99,7 +99,7 @@
);
}
-@@ -1885,10 +1924,12 @@ static int park_exec(struct ast_channel
+@@ -1888,10 +1927,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);
-@@ -2042,15 +2083,10 @@ static struct ast_cli_entry cli_show_fea
+@@ -2045,15 +2086,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)
-@@ -2074,12 +2110,13 @@ static int manager_parking_status( struc
+@@ -2077,12 +2113,13 @@ static int manager_parking_status( struc
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
@@ -148,7 +148,7 @@
idText);
}
-@@ -2154,6 +2191,427 @@ static int manager_park(struct mansessio
+@@ -2157,6 +2194,427 @@ static int manager_park(struct mansessio
return 0;
}
@@ -576,7 +576,7 @@
int ast_pickup_call(struct ast_channel *chan)
{
-@@ -2417,6 +2875,7 @@ static int load_config(void)
+@@ -2420,6 +2878,7 @@ static int load_config(void)
static int reload(void)
{
@@ -584,7 +584,7 @@
return load_config();
}
-@@ -2440,6 +2899,12 @@ static int load_module(void)
+@@ -2443,6 +2902,12 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -597,7 +597,7 @@
res |= ast_devstate_prov_add("Park", metermaidstate);
return res;
-@@ -2454,6 +2919,8 @@ static int unload_module(void)
+@@ -2457,6 +2922,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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-holdedcalls (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-holdedcalls Thu Dec 20 05:37:00 2007
@@ -71,7 +71,7 @@
char *ast_parking_ext(void)
{
return parking_ext;
-@@ -2009,6 +2033,282 @@ static int park_exec(struct ast_channel
+@@ -2012,6 +2036,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;
-@@ -2890,6 +3190,7 @@ static int load_module(void)
+@@ -2893,6 +3193,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);
-@@ -2899,6 +3200,7 @@ static int load_module(void)
+@@ -2902,6 +3203,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);
-@@ -2921,6 +3223,7 @@ static int unload_module(void)
+@@ -2924,6 +3226,7 @@ static int unload_module(void)
ast_unregister_application(parkcall);
ast_unregister_application(autoanswer);
ast_unregister_application(autoanswerlogin);
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation Thu Dec 20 05:37:00 2007
@@ -2,7 +2,7 @@
--- a/main/channel.c
+++ b/main/channel.c
-@@ -804,10 +804,10 @@ struct ast_channel *ast_channel_alloc(in
+@@ -808,10 +808,10 @@ struct ast_channel *ast_channel_alloc(in
tmp->fout = global_fout;
if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME)) {
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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Thu Dec 20 05:37:00 2007
@@ -2,7 +2,7 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -651,6 +651,18 @@ void ast_channel_free(struct ast_channe
+@@ -659,6 +659,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
-@@ -664,9 +676,9 @@ struct ast_channel *ast_request(const ch
+@@ -672,9 +684,9 @@ struct ast_channel *ast_request(const ch
* \return Returns an ast_channel on success or no answer, NULL on failure. Check the value of chan->_state
* to know if the call was answered or not.
*/
@@ -33,7 +33,7 @@
/*! \brief "Requests" a channel for sending a message
* \param type type of channel to request
-@@ -951,6 +963,8 @@ struct ast_channel *ast_get_channel_by_e
+@@ -959,6 +971,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);
@@ -44,7 +44,7 @@
* \param c channel to wait for a digit on
--- a/main/channel.c
+++ b/main/channel.c
-@@ -1028,7 +1028,7 @@ void ast_channel_undefer_dtmf(struct ast
+@@ -1032,7 +1032,7 @@ void ast_channel_undefer_dtmf(struct ast
*/
static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
const char *name, const int namelen,
@@ -53,7 +53,7 @@
{
const char *msg = prev ? "deadlock" : "initial deadlock";
int retries;
-@@ -1056,7 +1056,10 @@ static struct ast_channel *channel_find_
+@@ -1060,7 +1060,10 @@ static struct ast_channel *channel_find_
* XXX Need a better explanation for this ...
*/
}
@@ -65,7 +65,7 @@
if ((!namelen && strcasecmp(c->name, name)) ||
(namelen && strncasecmp(c->name, name, namelen)))
continue; /* name match failed */
-@@ -1111,39 +1114,44 @@ static struct ast_channel *channel_find_
+@@ -1115,39 +1118,44 @@ static struct ast_channel *channel_find_
/*! \brief Browse channels in use */
struct ast_channel *ast_channel_walk_locked(const struct ast_channel *prev)
{
@@ -116,7 +116,7 @@
}
/*! \brief Wait, look for hangups and condition arg */
-@@ -1213,8 +1221,10 @@ void ast_channel_free(struct ast_channel
+@@ -1217,8 +1225,10 @@ void ast_channel_free(struct ast_channel
free(chan->tech_pvt);
}
@@ -129,7 +129,7 @@
ast_copy_string(name, chan->name, sizeof(name));
-@@ -3079,7 +3089,7 @@ char *ast_channel_reason2str(int reason)
+@@ -3103,7 +3113,7 @@ char *ast_channel_reason2str(int reason)
}
}
@@ -138,7 +138,7 @@
{
int dummy_outstate;
int cause = 0;
-@@ -3091,7 +3101,7 @@ struct ast_channel *__ast_request_and_di
+@@ -3115,7 +3125,7 @@ struct ast_channel *__ast_request_and_di
else
outstate = &dummy_outstate; /* make outstate always a valid pointer */
@@ -147,7 +147,7 @@
if (!chan) {
ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
/* compute error and return */
-@@ -3114,7 +3124,7 @@ struct ast_channel *__ast_request_and_di
+@@ -3138,7 +3148,7 @@ struct ast_channel *__ast_request_and_di
ast_cdr_setaccount(chan, oh->account);
}
ast_set_callerid(chan, cid_num, cid_name, cid_num);
@@ -156,7 +156,7 @@
if (!chan->cdr) { /* up till now, this insertion hasn't been done. Therefore,
-@@ -3203,12 +3213,12 @@ struct ast_channel *__ast_request_and_di
+@@ -3227,12 +3237,12 @@ struct ast_channel *__ast_request_and_di
return chan;
}
@@ -172,7 +172,7 @@
{
struct chanlist *chan;
struct ast_channel *c;
-@@ -3258,6 +3268,11 @@ struct ast_channel *ast_request(const ch
+@@ -3282,6 +3292,11 @@ struct ast_channel *ast_request(const ch
return NULL;
}
@@ -184,7 +184,7 @@
int ast_call(struct ast_channel *chan, char *addr, int timeout)
{
/* Place an outgoing call, but don't wait any longer than timeout ms before returning.
-@@ -3645,7 +3660,7 @@ int ast_do_masquerade(struct ast_channel
+@@ -3669,7 +3684,7 @@ int ast_do_masquerade(struct ast_channel
ast_string_field_set(clone, name, masqn);
/* Notify any managers of the change, first the masq then the other */
@@ -226,7 +226,7 @@
*
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -4989,7 +4989,7 @@ static int ast_pbx_outgoing_cdr_failed(v
+@@ -4979,7 +4979,7 @@ static int ast_pbx_outgoing_cdr_failed(v
return 0; /* success */
}
@@ -235,7 +235,7 @@
{
struct ast_channel *chan;
struct async_stat *as;
-@@ -4999,7 +4999,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -4989,7 +4989,7 @@ int ast_pbx_outgoing_exten(const char *t
if (sync) {
LOAD_OH(oh);
@@ -244,7 +244,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5084,7 +5084,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -5074,7 +5074,7 @@ int ast_pbx_outgoing_exten(const char *t
res = -1;
goto outgoing_exten_cleanup;
}
@@ -253,7 +253,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5124,6 +5124,10 @@ outgoing_exten_cleanup:
+@@ -5114,6 +5114,10 @@ outgoing_exten_cleanup:
return res;
}
@@ -264,7 +264,7 @@
struct app_tmp {
char app[256];
char data[256];
-@@ -5148,7 +5152,7 @@ static void *ast_pbx_run_app(void *data)
+@@ -5138,7 +5142,7 @@ static void *ast_pbx_run_app(void *data)
return NULL;
}
@@ -273,7 +273,7 @@
{
struct ast_channel *chan;
struct app_tmp *tmp;
-@@ -5167,10 +5171,10 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5157,10 +5161,10 @@ int ast_pbx_outgoing_app(const char *typ
goto outgoing_app_cleanup;
}
if (sync) {
@@ -286,7 +286,7 @@
} else {
chan->cdr = ast_cdr_alloc(); /* allocate a cdr for the channel */
if(!chan->cdr) {
-@@ -5251,7 +5255,7 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5241,7 +5245,7 @@ int ast_pbx_outgoing_app(const char *typ
res = -1;
goto outgoing_app_cleanup;
}
@@ -295,7 +295,7 @@
if (!chan) {
free(as);
res = -1;
-@@ -5291,6 +5295,10 @@ outgoing_app_cleanup:
+@@ -5281,6 +5285,10 @@ outgoing_app_cleanup:
return res;
}
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=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Thu Dec 20 05:37:00 2007
@@ -9,7 +9,7 @@
struct ast_variable *vars;
};
-@@ -1417,11 +1419,20 @@ static int action_hangup(struct mansessi
+@@ -1415,11 +1417,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;
-@@ -1672,12 +1683,18 @@ static int action_redirect(struct manses
+@@ -1670,12 +1681,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)) {
-@@ -1687,7 +1704,11 @@ static int action_redirect(struct manses
+@@ -1685,7 +1702,11 @@ static int action_redirect(struct manses
}
}
/* XXX watch out, possible deadlock!!! */
@@ -67,7 +67,7 @@
if (!chan) {
char buf[BUFSIZ];
snprintf(buf, sizeof(buf), "Channel does not exist: %s", name);
-@@ -1709,9 +1730,9 @@ static int action_redirect(struct manses
+@@ -1707,9 +1728,9 @@ static int action_redirect(struct manses
}
res = ast_async_goto(chan, context, exten, pi);
if (!res) {
@@ -79,7 +79,7 @@
else
res = -1;
if (!res)
-@@ -1790,15 +1811,15 @@ static void *fast_originate(void *data)
+@@ -1788,15 +1809,15 @@ static void *fast_originate(void *data)
char requested_channel[AST_CHANNEL_NAME];
if (!ast_strlen_zero(in->app)) {
@@ -99,7 +99,7 @@
}
if (!chan)
-@@ -1858,6 +1879,7 @@ static int action_originate(struct manse
+@@ -1856,6 +1877,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");
@@ -107,7 +107,7 @@
struct ast_variable *vars = astman_get_variables(m);
char *tech, *data;
char *l = NULL, *n = NULL;
-@@ -1867,6 +1889,9 @@ static int action_originate(struct manse
+@@ -1865,6 +1887,9 @@ static int action_originate(struct manse
int reason = 0;
char tmp[256];
char tmp2[256];
@@ -117,7 +117,7 @@
pthread_t th;
pthread_attr_t attr;
-@@ -1884,6 +1909,10 @@ static int action_originate(struct manse
+@@ -1882,6 +1907,10 @@ static int action_originate(struct manse
astman_send_error(s, m, "Invalid timeout\n");
return 0;
}
@@ -128,7 +128,7 @@
ast_copy_string(tmp, name, sizeof(tmp));
tech = tmp;
data = strchr(tmp, '/');
-@@ -1903,6 +1932,7 @@ static int action_originate(struct manse
+@@ -1901,6 +1930,7 @@ static int action_originate(struct manse
if (ast_strlen_zero(l))
l = NULL;
}
@@ -136,7 +136,7 @@
if (ast_true(async)) {
struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));
if (!fast) {
-@@ -1922,8 +1952,10 @@ static int action_originate(struct manse
+@@ -1920,8 +1950,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));
@@ -147,7 +147,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&th, &attr, fast_originate, fast)) {
-@@ -1934,19 +1966,28 @@ static int action_originate(struct manse
+@@ -1932,19 +1964,28 @@ static int action_originate(struct manse
pthread_attr_destroy(&attr);
}
} else if (!ast_strlen_zero(app)) {
@@ -193,7 +193,7 @@
#include <unistd.h>
#ifdef POLLCOMPAT
#include "asterisk/poll-compat.h"
-@@ -996,6 +999,8 @@ int ast_waitfordigit_full(struct ast_cha
+@@ -1004,6 +1007,8 @@ int ast_waitfordigit_full(struct ast_cha
int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders);
int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders, int audiofd, int ctrlfd);
Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Dec 20 05:37:00 2007
@@ -1,6 +1,6 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -420,6 +420,7 @@ struct ast_channel {
+@@ -423,6 +423,7 @@ struct ast_channel {
unsigned int flags; /*!< channel flags of AST_FLAG_ type */
unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
AST_LIST_HEAD_NOLOCK(, ast_frame) readq;
@@ -10,7 +10,7 @@
int nativeformats; /*!< Kinds of data this channel can natively handle */
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -5136,7 +5136,7 @@ struct app_tmp {
+@@ -5126,7 +5126,7 @@ struct app_tmp {
};
/*! \brief run the application and free the descriptor once done */
@@ -43,7 +43,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.
-@@ -191,7 +195,7 @@ static const char config[] = "zapata.con
+@@ -192,7 +196,7 @@ static const char config[] = "zapata.con
#define SIG_GR303FXOKS (0x0100000 | ZT_SIG_FXOKS)
#define SIG_GR303FXSKS (0x0100000 | ZT_SIG_FXSKS)
@@ -52,7 +52,7 @@
#define NUM_DCHANS 4 /*!< No more than 4 d-channels */
#define MAX_CHANNELS 672 /*!< No more than a DS3 per trunk group */
-@@ -217,8 +221,6 @@ static struct ast_channel inuse;
+@@ -218,8 +222,6 @@ static struct ast_channel inuse;
#ifdef PRI_GETSET_TIMERS
static int pritimers[PRI_MAX_TIMERS];
#endif
@@ -61,7 +61,7 @@
#endif
/*! \brief Wait up to 16 seconds for first digit (FXO logic) */
-@@ -236,10 +238,6 @@ AST_MUTEX_DEFINE_STATIC(iflock);
+@@ -237,10 +239,6 @@ AST_MUTEX_DEFINE_STATIC(iflock);
static int ifcount = 0;
@@ -72,7 +72,7 @@
/*! \brief Protect the monitoring thread, so only one process can kill or start it, and not
when it's doing something critical. */
AST_MUTEX_DEFINE_STATIC(monlock);
-@@ -254,6 +252,7 @@ static enum ast_bridge_result zt_bridge(
+@@ -255,6 +253,7 @@ static enum ast_bridge_result zt_bridge(
static int zt_sendtext(struct ast_channel *c, const char *text);
@@ -80,7 +80,7 @@
/*! \brief Avoid the silly zt_getevent which ignores a bunch of events */
static inline int zt_get_event(int fd)
{
-@@ -298,6 +297,27 @@ static int ringt_base = DEFAULT_RINGT;
+@@ -299,6 +298,27 @@ static int ringt_base = DEFAULT_RINGT;
#define PRI_SPAN(p) (((p) >> 8) & 0xff)
#define PRI_EXPLICIT(p) (((p) >> 16) & 0x01)
@@ -108,7 +108,7 @@
struct zt_pri {
pthread_t master; /*!< Thread of master */
ast_mutex_t lock; /*!< Mutex */
-@@ -311,6 +331,8 @@ struct zt_pri {
+@@ -312,6 +332,8 @@ struct zt_pri {
int nsf; /*!< Network-Specific Facilities */
int dialplan; /*!< Dialing plan */
int localdialplan; /*!< Local dialing plan */
@@ -117,7 +117,7 @@
char internationalprefix[10]; /*!< country access code ('00' for european dialplans) */
char nationalprefix[10]; /*!< area access code ('0' for european dialplans) */
char localprefix[20]; /*!< area access code + area code ('0'+area code for european dialplans) */
-@@ -322,6 +344,7 @@ struct zt_pri {
+@@ -323,6 +345,7 @@ struct zt_pri {
int prilogicalspan; /*!< Logical span number within trunk group */
int numchans; /*!< Num of channels we represent */
int overlapdial; /*!< In overlap dialing mode */
@@ -125,7 +125,7 @@
int facilityenable; /*!< Enable facility IEs */
struct pri *dchans[NUM_DCHANS]; /*!< Actual d-channels */
int dchanavail[NUM_DCHANS]; /*!< Whether each channel is available */
-@@ -337,6 +360,9 @@ struct zt_pri {
+@@ -338,6 +361,9 @@ struct zt_pri {
struct zt_pvt *pvts[MAX_CHANNELS]; /*!< Member channel pvt structs */
struct zt_pvt *crvs; /*!< Member CRV structs */
struct zt_pvt *crvend; /*!< Pointer to end of CRV structs */
@@ -135,7 +135,7 @@
};
-@@ -454,6 +480,8 @@ static struct zt_pvt {
+@@ -455,6 +481,8 @@ static struct zt_pvt {
unsigned int echocanbridged:1;
unsigned int echocanon:1;
unsigned int faxhandled:1; /*!< Has a fax tone already been handled? */
@@ -144,7 +144,7 @@
unsigned int firstradio:1;
unsigned int hanguponpolarityswitch:1;
unsigned int hardwaredtmf:1;
-@@ -467,7 +495,8 @@ static struct zt_pvt {
+@@ -468,7 +496,8 @@ static struct zt_pvt {
unsigned int overlapdial:1;
unsigned int permcallwaiting:1;
unsigned int permhidecallerid:1; /*!< Whether to hide our outgoing caller ID or not */
@@ -154,7 +154,7 @@
unsigned int priexclusive:1;
unsigned int pulse:1;
unsigned int pulsedial:1; /*!< whether a pulse dial phone is detected */
-@@ -504,6 +533,7 @@ static struct zt_pvt {
+@@ -505,6 +534,7 @@ static struct zt_pvt {
#endif
char cid_num[AST_MAX_EXTENSION];
int cid_ton; /*!< Type Of Number (TON) */
@@ -162,7 +162,7 @@
char cid_name[AST_MAX_EXTENSION];
char lastcid_num[AST_MAX_EXTENSION];
char lastcid_name[AST_MAX_EXTENSION];
-@@ -569,6 +599,8 @@ static struct zt_pvt {
+@@ -570,6 +600,8 @@ static struct zt_pvt {
struct zt_pvt *bearer;
struct zt_pvt *realcall;
q931_call *call;
@@ -171,7 +171,7 @@
int prioffset;
int logicalspan;
#endif
-@@ -614,11 +646,14 @@ static struct zt_chan_conf zt_chan_conf_
+@@ -615,11 +647,14 @@ static struct zt_chan_conf zt_chan_conf_
.minunused = 2,
.idleext = "",
.idledial = "",
@@ -186,7 +186,7 @@
.resetinterval = 3600
},
-@@ -630,6 +665,8 @@ static struct zt_chan_conf zt_chan_conf_
+@@ -631,6 +666,8 @@ static struct zt_chan_conf zt_chan_conf_
.mohinterpret = "default",
.mohsuggest = "",
.transfertobusy = 1,
@@ -195,7 +195,7 @@
.cid_signalling = CID_SIG_BELL,
.cid_start = CID_START_RING,
-@@ -684,6 +721,8 @@ static int zt_indicate(struct ast_channe
+@@ -685,6 +722,8 @@ static int zt_indicate(struct ast_channe
static int zt_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
static int zt_setoption(struct ast_channel *chan, int option, void *data, int datalen);
static int zt_func_read(struct ast_channel *chan, char *function, char *data, char *buf, size_t len);
@@ -204,7 +204,7 @@
static const struct ast_channel_tech zap_tech = {
.type = "Zap",
-@@ -716,6 +755,13 @@ static const struct ast_channel_tech zap
+@@ -717,6 +756,13 @@ static const struct ast_channel_tech zap
struct zt_pvt *round_robin[32];
#ifdef HAVE_PRI
@@ -218,7 +218,7 @@
static inline int pri_grab(struct zt_pvt *pvt, struct zt_pri *pri)
{
int res;
-@@ -1524,12 +1570,16 @@ static void zt_enable_ec(struct zt_pvt *
+@@ -1525,12 +1571,16 @@ static void zt_enable_ec(struct zt_pvt *
int res;
if (!p)
return;
@@ -236,7 +236,7 @@
return;
}
if (p->echocancel) {
-@@ -1556,7 +1606,7 @@ static void zt_train_ec(struct zt_pvt *p
+@@ -1557,7 +1607,7 @@ static void zt_train_ec(struct zt_pvt *p
{
int x;
int res;
@@ -245,7 +245,7 @@
x = p->echotraining;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_ECHOTRAIN, &x);
if (res)
-@@ -1917,7 +1967,12 @@ static int zt_call(struct ast_channel *a
+@@ -1918,7 +1968,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;
@@ -259,7 +259,7 @@
mysig = p->sig;
if (p->outsigmod > -1)
-@@ -2148,6 +2203,7 @@ static int zt_call(struct ast_channel *a
+@@ -2149,6 +2204,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';
@@ -267,7 +267,7 @@
break;
default:
ast_log(LOG_DEBUG, "not yet implemented\n");
-@@ -2168,6 +2224,12 @@ static int zt_call(struct ast_channel *a
+@@ -2169,6 +2225,12 @@ static int zt_call(struct ast_channel *a
const char *rr_str;
int redirect_reason;
@@ -280,7 +280,7 @@
c = strchr(dest, '/');
if (c)
c++;
-@@ -2190,6 +2252,7 @@ static int zt_call(struct ast_channel *a
+@@ -2191,6 +2253,7 @@ static int zt_call(struct ast_channel *a
ast_mutex_unlock(&p->lock);
return -1;
}
@@ -288,7 +288,7 @@
if (mysig != SIG_FXSKS) {
p->dop.op = ZT_DIAL_OP_REPLACE;
s = strchr(c + p->stripmsd, 'w');
-@@ -2213,6 +2276,8 @@ static int zt_call(struct ast_channel *a
+@@ -2214,6 +2277,8 @@ static int zt_call(struct ast_channel *a
pri_rel(p->pri);
ast_mutex_unlock(&p->lock);
return -1;
@@ -297,7 +297,7 @@
}
if (!(sr = pri_sr_new())) {
ast_log(LOG_WARNING, "Failed to allocate setup request channel %d\n", p->channel);
-@@ -2242,7 +2307,7 @@ static int zt_call(struct ast_channel *a
+@@ -2243,7 +2308,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 :
@@ -306,7 +306,7 @@
if (p->pri->facilityenable)
pri_facility_enable(p->pri->pri);
-@@ -2506,8 +2571,10 @@ static int pri_find_dchan(struct zt_pri
+@@ -2507,8 +2572,10 @@ static int pri_find_dchan(struct zt_pri
}
if (newslot < 0) {
newslot = 0;
@@ -318,7 +318,7 @@
}
if (old && (oldslot != newslot))
ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n",
-@@ -2517,6 +2584,16 @@ static int pri_find_dchan(struct zt_pri
+@@ -2518,6 +2585,16 @@ static int pri_find_dchan(struct zt_pri
}
#endif
@@ -335,7 +335,7 @@
static int zt_hangup(struct ast_channel *ast)
{
int res;
-@@ -2564,8 +2641,7 @@ static int zt_hangup(struct ast_channel
+@@ -2565,8 +2642,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);
@@ -345,7 +345,7 @@
if (index > -1) {
/* Real channel, do some fixup */
p->subs[index].owner = NULL;
-@@ -2667,6 +2743,7 @@ static int zt_hangup(struct ast_channel
+@@ -2668,6 +2744,7 @@ static int zt_hangup(struct ast_channel
}
if (!p->subs[SUB_REAL].owner && !p->subs[SUB_CALLWAIT].owner && !p->subs[SUB_THREEWAY].owner) {
@@ -353,7 +353,7 @@
p->owner = NULL;
p->ringt = 0;
p->distinctivering = 0;
-@@ -2709,7 +2786,7 @@ static int zt_hangup(struct ast_channel
+@@ -2710,7 +2787,7 @@ static int zt_hangup(struct ast_channel
pri_call_set_useruser(p->call, useruser);
#endif
@@ -362,7 +362,7 @@
p->call = NULL;
if (p->bearer)
p->bearer->call = NULL;
-@@ -2729,7 +2806,28 @@ static int zt_hangup(struct ast_channel
+@@ -2730,7 +2807,28 @@ static int zt_hangup(struct ast_channel
if (atoi(cause))
icause = atoi(cause);
}
@@ -392,7 +392,7 @@
}
if (res < 0)
ast_log(LOG_WARNING, "pri_disconnect failed\n");
-@@ -2913,10 +3011,14 @@ static int zt_answer(struct ast_channel
+@@ -2914,10 +3012,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);
@@ -407,7 +407,7 @@
break;
#endif
case 0:
-@@ -3553,6 +3655,15 @@ static int zt_fixup(struct ast_channel *
+@@ -3554,6 +3656,15 @@ static int zt_fixup(struct ast_channel *
{
struct zt_pvt *p = newchan->tech_pvt;
int x;
@@ -423,7 +423,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) {
-@@ -3762,8 +3873,10 @@ static void zt_handle_dtmfup(struct ast_
+@@ -3763,8 +3874,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);
@@ -435,7 +435,7 @@
} else if (option_debug)
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
} else if (option_debug)
-@@ -3917,7 +4030,7 @@ static struct ast_frame *zt_handle_event
+@@ -3923,7 +4036,7 @@ static struct ast_frame *zt_handle_event
if (p->call) {
if (p->pri && p->pri->pri) {
if (!pri_grab(p, p->pri)) {
@@ -444,7 +444,7 @@
pri_destroycall(p->pri->pri, p->call);
p->call = NULL;
pri_rel(p->pri);
-@@ -4976,7 +5089,7 @@ static struct ast_frame *zt_read(struct
+@@ -4974,7 +5087,7 @@ static struct ast_frame *zt_read(struct
p->subs[index].f.data = NULL;
p->subs[index].f.datalen= 0;
}
@@ -453,7 +453,7 @@
/* Perform busy detection. etc on the zap line */
f = ast_dsp_process(ast, p->dsp, &p->subs[index].f);
if (f) {
-@@ -4988,8 +5101,9 @@ static struct ast_frame *zt_read(struct
+@@ -4986,8 +5099,9 @@ static struct ast_frame *zt_read(struct
}
} else if (f->frametype == AST_FRAME_DTMF) {
#ifdef HAVE_PRI
@@ -465,7 +465,7 @@
f->frametype = AST_FRAME_NULL;
f->subclass = 0;
}
-@@ -5064,7 +5178,9 @@ static int zt_write(struct ast_channel *
+@@ -5062,7 +5176,9 @@ static int zt_write(struct ast_channel *
#endif
/* Write a frame of (presumably voice) data */
if (frame->frametype != AST_FRAME_VOICE) {
@@ -476,7 +476,7 @@
ast_log(LOG_WARNING, "Don't know what to do with frame type '%d'\n", frame->frametype);
return 0;
}
-@@ -5132,7 +5248,7 @@ static int zt_indicate(struct ast_channe
+@@ -5130,7 +5246,7 @@ static int zt_indicate(struct ast_channe
switch (condition) {
case AST_CONTROL_BUSY:
#ifdef HAVE_PRI
@@ -485,7 +485,7 @@
chan->hangupcause = AST_CAUSE_USER_BUSY;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5214,7 +5330,7 @@ static int zt_indicate(struct ast_channe
+@@ -5212,7 +5328,7 @@ static int zt_indicate(struct ast_channe
case AST_CONTROL_CONGESTION:
chan->hangupcause = AST_CAUSE_CONGESTION;
#ifdef HAVE_PRI
@@ -494,7 +494,7 @@
chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5408,8 +5524,12 @@ static struct ast_channel *zt_new(struct
+@@ -5406,8 +5522,12 @@ static struct ast_channel *zt_new(struct
if (state == AST_STATE_RING)
tmp->rings = 1;
tmp->tech_pvt = i;
@@ -508,7 +508,7 @@
tmp->callgroup = i->callgroup;
tmp->pickupgroup = i->pickupgroup;
}
-@@ -5539,6 +5659,7 @@ static void *ss_thread(void *data)
+@@ -5537,6 +5657,7 @@ static void *ss_thread(void *data)
int len = 0;
int res;
int index;
@@ -516,7 +516,7 @@
/* in the bizarre case where the channel has become a zombie before we
even get started here, abort safely
-@@ -5567,10 +5688,17 @@ static void *ss_thread(void *data)
+@@ -5565,10 +5686,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)) {
@@ -537,7 +537,7 @@
if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num))
timeout = matchdigittimeout;
else
-@@ -6778,18 +6906,44 @@ static int handle_init_event(struct zt_p
+@@ -6784,18 +6912,44 @@ static int handle_init_event(struct zt_p
break;
case ZT_EVENT_NOALARM:
i->inalarm = 0;
@@ -582,7 +582,7 @@
/* fall thru intentionally */
case ZT_EVENT_ONHOOK:
if (i->radio)
-@@ -6833,8 +6987,10 @@ static int handle_init_event(struct zt_p
+@@ -6839,8 +6993,10 @@ static int handle_init_event(struct zt_p
zt_set_hook(i->subs[SUB_REAL].zfd, ZT_ONHOOK);
break;
case SIG_PRI:
@@ -595,7 +595,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);
-@@ -7126,6 +7282,8 @@ static int pri_resolve_span(int *span, i
+@@ -7139,6 +7295,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;
@@ -604,7 +604,7 @@
} else {
pris[*span].dchannels[0] = 24 + offset;
}
-@@ -7378,6 +7536,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7391,6 +7549,11 @@ static struct zt_pvt *mkintf(int channel
destroy_zt_pvt(&tmp);
return NULL;
}
@@ -616,7 +616,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);
-@@ -7395,6 +7558,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7408,6 +7571,11 @@ static struct zt_pvt *mkintf(int channel
return NULL;
}
pris[span].nodetype = conf.pri.nodetype;
@@ -628,7 +628,7 @@
pris[span].switchtype = myswitchtype;
pris[span].nsf = conf.pri.nsf;
pris[span].dialplan = conf.pri.dialplan;
-@@ -7403,9 +7571,14 @@ static struct zt_pvt *mkintf(int channel
+@@ -7416,9 +7584,14 @@ 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;
@@ -643,7 +643,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));
-@@ -7541,6 +7714,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7554,6 +7727,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;
@@ -651,7 +651,7 @@
tmp->priexclusive = conf.chan.priexclusive;
if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) {
-@@ -7820,7 +7994,7 @@ static int pri_find_empty_chan(struct zt
+@@ -7833,7 +8007,7 @@ static int pri_find_empty_chan(struct zt
break;
if (!backwards && (x >= pri->numchans))
break;
@@ -660,7 +660,7 @@
ast_log(LOG_DEBUG, "Found empty available channel %d/%d\n",
pri->pvts[x]->logicalspan, pri->pvts[x]->prioffset);
return x;
-@@ -8016,6 +8190,11 @@ static struct ast_channel *zt_request(co
+@@ -8029,6 +8203,11 @@ static struct ast_channel *zt_request(co
p->digital = 1;
if (tmp)
tmp->transfercapability = AST_TRANS_CAP_DIGITAL;
@@ -672,7 +672,7 @@
} else {
ast_log(LOG_WARNING, "Unknown option '%c' in '%s'\n", opt, (char *)data);
}
-@@ -8049,13 +8228,14 @@ next:
+@@ -8062,13 +8241,14 @@ next:
*cause = AST_CAUSE_BUSY;
} else if (groupmatched) {
*cause = AST_CAUSE_CONGESTION;
@@ -688,7 +688,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8069,6 +8249,58 @@ static struct zt_pvt *pri_find_crv(struc
+@@ -8082,6 +8262,58 @@ static struct zt_pvt *pri_find_crv(struc
return NULL;
}
@@ -747,7 +747,7 @@
static int pri_find_principle(struct zt_pri *pri, int channel)
{
-@@ -8100,7 +8332,9 @@ static int pri_find_principle(struct zt_
+@@ -8113,7 +8345,9 @@ static int pri_find_principle(struct zt_
static int pri_fixup_principle(struct zt_pri *pri, int principle, q931_call *c)
{
int x;
@@ -757,7 +757,7 @@
if (!c) {
if (principle < 0)
return -1;
-@@ -8128,6 +8362,7 @@ static int pri_fixup_principle(struct zt
+@@ -8141,6 +8375,7 @@ static int pri_fixup_principle(struct zt
}
/* Fix it all up now */
pri->pvts[principle]->owner = pri->pvts[x]->owner;
@@ -765,7 +765,7 @@
if (pri->pvts[principle]->owner) {
ast_string_field_build(pri->pvts[principle]->owner, name,
"Zap/%d:%d-%d", pri->trunkgroup,
-@@ -8135,13 +8370,48 @@ static int pri_fixup_principle(struct zt
+@@ -8148,13 +8383,48 @@ static int pri_fixup_principle(struct zt
pri->pvts[principle]->owner->tech_pvt = pri->pvts[principle];
pri->pvts[principle]->owner->fds[0] = pri->pvts[principle]->subs[SUB_REAL].zfd;
pri->pvts[principle]->subs[SUB_REAL].owner = pri->pvts[x]->subs[SUB_REAL].owner;
@@ -815,7 +815,7 @@
}
return principle;
}
-@@ -8170,7 +8440,9 @@ static int pri_fixup_principle(struct zt
+@@ -8183,7 +8453,9 @@ static int pri_fixup_principle(struct zt
}
crv = crv->next;
}
@@ -826,7 +826,7 @@
return -1;
}
-@@ -8229,86 +8501,21 @@ static void *do_idle_thread(void *vchan)
+@@ -8242,86 +8514,21 @@ static void *do_idle_thread(void *vchan)
#ifndef PRI_RESTART
#error "Upgrade your libpri"
#endif
@@ -920,7 +920,7 @@
do {
pri->resetpos++;
} while ((pri->resetpos < pri->numchans) &&
-@@ -8392,13 +8599,30 @@ static void apply_plan_to_number(char *b
+@@ -8405,13 +8612,30 @@ static void apply_plan_to_number(char *b
}
}
@@ -958,7 +958,7 @@
}
static void *pri_dchannel(void *vpri)
-@@ -8578,15 +8802,44 @@ static void *pri_dchannel(void *vpri)
+@@ -8591,15 +8815,44 @@ static void *pri_dchannel(void *vpri)
/* Check for an event */
x = 0;
res = ioctl(pri->fds[which], ZT_GETEVENT, &x);
@@ -1006,7 +1006,7 @@
}
if (option_debug)
-@@ -8598,8 +8851,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8611,8 +8864,7 @@ static void *pri_dchannel(void *vpri)
break;
}
} else if (errno != EINTR)
@@ -1016,7 +1016,7 @@
if (e) {
if (pri->debug)
pri_dump_event(pri->dchans[which], e);
-@@ -8612,32 +8864,86 @@ static void *pri_dchannel(void *vpri)
+@@ -8625,32 +8877,86 @@ static void *pri_dchannel(void *vpri)
switch (e->e) {
case PRI_EVENT_DCHAN_UP:
@@ -1120,7 +1120,7 @@
pri->resetting = 0;
/* Hangup active channels and put them in alarm mode */
for (i = 0; i < pri->numchans; i++) {
-@@ -8647,12 +8953,13 @@ static void *pri_dchannel(void *vpri)
+@@ -8660,12 +8966,13 @@ static void *pri_dchannel(void *vpri)
/* T309 is not enabled : hangup calls when alarm occurs */
if (p->call) {
if (p->pri && p->pri->pri) {
@@ -1135,7 +1135,7 @@
if (p->realcall) {
pri_hangup_all(p->realcall, pri);
} else if (p->owner)
-@@ -8661,6 +8968,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8674,6 +8981,7 @@ static void *pri_dchannel(void *vpri)
p->inalarm = 1;
}
}
@@ -1143,7 +1143,7 @@
}
break;
case PRI_EVENT_RESTART:
-@@ -8695,8 +9003,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8708,8 +9016,8 @@ static void *pri_dchannel(void *vpri)
pri_destroycall(pri->pri, pri->pvts[x]->call);
pri->pvts[x]->call = NULL;
}
@@ -1154,7 +1154,7 @@
else if (pri->pvts[x]->owner)
pri->pvts[x]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_mutex_unlock(&pri->pvts[x]->lock);
-@@ -8730,7 +9038,6 @@ static void *pri_dchannel(void *vpri)
+@@ -8743,7 +9051,6 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -1162,7 +1162,7 @@
case PRI_EVENT_INFO_RECEIVED:
chanpos = pri_find_principle(pri, e->ring.channel);
if (chanpos < 0) {
-@@ -8739,9 +9046,11 @@ static void *pri_dchannel(void *vpri)
+@@ -8752,9 +9059,11 @@ static void *pri_dchannel(void *vpri)
} else {
chanpos = pri_fixup_principle(pri, chanpos, e->ring.call);
if (chanpos > -1) {
@@ -1175,7 +1175,7 @@
/* how to do that */
int digitlen = strlen(e->ring.callednum);
char digit;
-@@ -8753,6 +9062,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8766,6 +9075,14 @@ static void *pri_dchannel(void *vpri)
zap_queue_frame(pri->pvts[chanpos], &f, pri);
}
}
@@ -1190,7 +1190,7 @@
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
-@@ -8760,36 +9077,59 @@ static void *pri_dchannel(void *vpri)
+@@ -8773,36 +9090,59 @@ static void *pri_dchannel(void *vpri)
break;
case PRI_EVENT_RING:
crv = NULL;
@@ -1266,7 +1266,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));
-@@ -8803,13 +9143,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8816,13 +9156,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);
@@ -1383,7 +1383,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)) {
-@@ -8875,19 +9265,36 @@ static void *pri_dchannel(void *vpri)
+@@ -8893,19 +9282,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);
@@ -1423,7 +1423,7 @@
/* Get the use_callingpres state */
pri->pvts[chanpos]->callingpres = e->ring.callingpres;
-@@ -8899,14 +9306,31 @@ static void *pri_dchannel(void *vpri)
+@@ -8917,14 +9323,31 @@ 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);
@@ -1455,7 +1455,7 @@
if (e->ring.ani2 >= 0) {
snprintf(ani2str, 5, "%.2d", e->ring.ani2);
pbx_builtin_setvar_helper(c, "ANI2", ani2str);
-@@ -8928,8 +9352,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8946,8 +9369,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)
@@ -1466,7 +1466,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",
-@@ -8937,15 +9361,19 @@ static void *pri_dchannel(void *vpri)
+@@ -8955,15 +9378,19 @@ static void *pri_dchannel(void *vpri)
if (c)
ast_hangup(c);
else {
@@ -1487,7 +1487,7 @@
ast_mutex_lock(&pri->lock);
if (c) {
char calledtonstr[10];
-@@ -8966,23 +9394,40 @@ static void *pri_dchannel(void *vpri)
+@@ -8984,23 +9411,40 @@ static void *pri_dchannel(void *vpri)
snprintf(calledtonstr, sizeof(calledtonstr)-1, "%d", e->ring.calledplan);
pbx_builtin_setvar_helper(c, "CALLEDTON", calledtonstr);
if (option_verbose > 2)
@@ -1532,7 +1532,7 @@
pri->pvts[chanpos]->call = NULL;
pri->pvts[chanpos]->exten[0] = '\0';
}
-@@ -8991,9 +9436,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9009,9 +9453,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
if (e->ring.flexible)
@@ -1544,7 +1544,7 @@
}
break;
case PRI_EVENT_RINGING:
-@@ -9009,7 +9454,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9027,7 +9471,7 @@ static void *pri_dchannel(void *vpri)
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
if (ast_strlen_zero(pri->pvts[chanpos]->dop.dialstr)) {
@@ -1553,7 +1553,7 @@
pri->pvts[chanpos]->subs[SUB_REAL].needringing = 1;
pri->pvts[chanpos]->alerting = 1;
} else
-@@ -9038,9 +9483,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9056,9 +9500,16 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_PROGRESS:
@@ -1571,7 +1571,7 @@
#ifdef PRI_PROGRESS_MASK
if ((!pri->pvts[chanpos]->progress) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
#else
-@@ -9087,6 +9539,12 @@ static void *pri_dchannel(void *vpri)
+@@ -9105,6 +9556,12 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_PROCEEDING:
chanpos = pri_find_principle(pri, e->proceeding.channel);
if (chanpos > -1) {
@@ -1584,7 +1584,7 @@
if (!pri->pvts[chanpos]->proceeding) {
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
-@@ -9134,6 +9592,295 @@ static void *pri_dchannel(void *vpri)
+@@ -9152,6 +9609,295 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -1880,7 +1880,7 @@
case PRI_EVENT_ANSWER:
chanpos = pri_find_principle(pri, e->answer.channel);
if (chanpos < 0) {
-@@ -9146,6 +9893,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9164,6 +9910,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);
@@ -1888,7 +1888,7 @@
/* Now we can do call progress detection */
/* We changed this so it turns on the DSP no matter what... progress or no progress.
-@@ -9175,11 +9923,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9193,11 +9940,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) {
@@ -1906,7 +1906,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9233,20 +9986,29 @@ static void *pri_dchannel(void *vpri)
+@@ -9251,20 +10003,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 {
@@ -1943,7 +1943,7 @@
#ifdef SUPPORT_USERUSER
if (pri->pvts[chanpos]->owner && !ast_strlen_zero(e->hangup.useruserinfo)) {
-@@ -9256,8 +10018,20 @@ static void *pri_dchannel(void *vpri)
+@@ -9274,8 +10035,20 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1966,7 +1966,7 @@
}
}
break;
-@@ -9267,15 +10041,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9285,15 +10058,23 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_HANGUP_REQ:
chanpos = pri_find_principle(pri, e->hangup.channel);
if (chanpos < 0) {
@@ -1993,7 +1993,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;
-@@ -9302,16 +10084,86 @@ static void *pri_dchannel(void *vpri)
+@@ -9320,16 +10101,86 @@ 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");
@@ -2084,7 +2084,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9322,9 +10174,39 @@ static void *pri_dchannel(void *vpri)
+@@ -9340,9 +10191,39 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -2125,7 +2125,7 @@
break;
case PRI_EVENT_HANGUP_ACK:
chanpos = pri_find_principle(pri, e->hangup.channel);
-@@ -9336,6 +10218,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9354,6 +10235,7 @@ static void *pri_dchannel(void *vpri)
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
pri->pvts[chanpos]->call = NULL;
@@ -2133,7 +2133,7 @@
pri->pvts[chanpos]->resetting = 0;
if (pri->pvts[chanpos]->owner) {
if (option_verbose > 2)
-@@ -9349,7 +10232,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9367,7 +10249,9 @@ static void *pri_dchannel(void *vpri)
#endif
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@@ -2143,7 +2143,7 @@
}
break;
case PRI_EVENT_CONFIG_ERR:
-@@ -9439,10 +10324,22 @@ static void *pri_dchannel(void *vpri)
+@@ -9457,10 +10341,22 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->pvts[chanpos]->lock);
switch (e->notify.info) {
case PRI_NOTIFY_REMOTE_HOLD:
@@ -2166,7 +2166,7 @@
f.subclass = AST_CONTROL_UNHOLD;
zap_queue_frame(pri->pvts[chanpos], &f, pri);
break;
-@@ -9450,6 +10347,77 @@ static void *pri_dchannel(void *vpri)
+@@ -9468,6 +10364,77 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
break;
@@ -2244,7 +2244,7 @@
default:
ast_log(LOG_DEBUG, "Event: %d\n", e->e);
}
-@@ -9511,7 +10479,7 @@ static int start_pri(struct zt_pri *pri)
+@@ -9529,7 +10496,7 @@ static int start_pri(struct zt_pri *pri)
pri->fds[i] = -1;
return -1;
}
@@ -2253,7 +2253,7 @@
/* Force overlap dial if we're doing GR-303! */
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial = 1;
-@@ -9579,39 +10547,77 @@ static char *complete_span_5(const char
+@@ -9597,39 +10564,77 @@ static char *complete_span_5(const char
static int handle_pri_set_debug_file(int fd, int argc, char **argv)
{
@@ -2351,7 +2351,7 @@
}
return RESULT_SUCCESS;
-@@ -9645,6 +10651,7 @@ static int handle_pri_debug(int fd, int
+@@ -9663,6 +10668,7 @@ static int handle_pri_debug(int fd, int
@@ -2359,7 +2359,7 @@
static int handle_pri_no_debug(int fd, int argc, char *argv[])
{
int span;
-@@ -9794,10 +10801,6 @@ static int handle_pri_show_debug(int fd,
+@@ -9812,10 +10818,6 @@ static int handle_pri_show_debug(int fd,
}
}
@@ -2370,7 +2370,7 @@
if (!count)
ast_cli(fd, "No debug set or no PRI running\n");
-@@ -9824,6 +10827,18 @@ static const char pri_show_spans_help[]
+@@ -9842,6 +10844,18 @@ static const char pri_show_spans_help[]
"Usage: pri show spans\n"
" Displays PRI Information\n";
@@ -2389,7 +2389,7 @@
static struct ast_cli_entry zap_pri_cli[] = {
{ { "pri", "debug", "span", NULL },
handle_pri_debug, "Enables PRI debugging on a span",
-@@ -9848,6 +10863,15 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9866,6 +10880,15 @@ static struct ast_cli_entry zap_pri_cli[
{ { "pri", "show", "debug", NULL },
handle_pri_show_debug, "Displays current PRI debug settings" },
@@ -2405,7 +2405,7 @@
{ { "pri", "set", "debug", "file", NULL },
handle_pri_set_debug_file, "Sends PRI debug output to the specified file" },
-@@ -9855,8 +10879,76 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9873,8 +10896,76 @@ static struct ast_cli_entry zap_pri_cli[
handle_pri_set_debug_file, "Ends PRI debug output to file" },
};
@@ -2482,7 +2482,7 @@
static int zap_destroy_channel(int fd, int argc, char **argv)
{
int channel;
-@@ -10437,8 +11529,11 @@ static int __unload_module(void)
+@@ -10455,8 +11546,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);
@@ -2494,7 +2494,7 @@
ast_manager_unregister( "ZapDialOffhook" );
ast_manager_unregister( "ZapHangup" );
ast_manager_unregister( "ZapTransfer" );
-@@ -10940,6 +12035,22 @@ static int process_zap(struct zt_chan_co
+@@ -10958,6 +12052,22 @@ static int process_zap(struct zt_chan_co
confp->chan.sig = SIG_GR303FXSKS;
confp->chan.radio = 0;
confp->pri.nodetype = PRI_CPE;
@@ -2517,7 +2517,7 @@
#endif
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
-@@ -11052,9 +12163,21 @@ static int process_zap(struct zt_chan_co
+@@ -11070,9 +12180,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;
@@ -2540,7 +2540,7 @@
} else if (!strcasecmp(v->name, "priexclusive")) {
confp->chan.priexclusive = ast_true(v->value);
} else if (!strcasecmp(v->name, "internationalprefix")) {
-@@ -11067,6 +12190,10 @@ static int process_zap(struct zt_chan_co
+@@ -11085,6 +12207,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));
@@ -2551,7 +2551,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -11083,6 +12210,8 @@ static int process_zap(struct zt_chan_co
+@@ -11101,6 +12227,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));
@@ -2560,7 +2560,7 @@
} else if (!strcasecmp(v->name, "overlapdial")) {
confp->pri.overlapdial = ast_true(v->value);
} else if (!strcasecmp(v->name, "pritimer")) {
-@@ -11384,6 +12513,7 @@ static int setup_zap(int reload)
+@@ -11402,6 +12530,7 @@ static int setup_zap(int reload)
#ifdef HAVE_PRI
if (!reload) {
for (x = 0; x < NUM_SPANS; x++) {
@@ -2568,7 +2568,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);
-@@ -11431,7 +12561,10 @@ static int load_module(void)
+@@ -11449,7 +12578,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));
@@ -2579,7 +2579,7 @@
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
memset(round_robin, 0, sizeof(round_robin));
-@@ -11465,6 +12598,7 @@ static int zt_sendtext(struct ast_channe
+@@ -11483,6 +12615,7 @@ static int zt_sendtext(struct ast_channe
float scont = 0.0;
int index;
@@ -2612,7 +2612,7 @@
; priexclusive = yes
--- a/main/channel.c
+++ b/main/channel.c
-@@ -4178,6 +4178,10 @@ enum ast_bridge_result ast_channel_bridg
+@@ -4206,6 +4206,10 @@ enum ast_bridge_result ast_channel_bridg
c1->name, c1->_bridge->name);
return -1;
}
Modified: asterisk/trunk/debian/patches/bristuff/zapata-device-state
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-device-state?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-device-state (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-device-state Thu Dec 20 05:37:00 2007
@@ -1,6 +1,6 @@
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
-@@ -103,6 +103,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -104,6 +104,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include "asterisk/abstract_jb.h"
#include "asterisk/smdi.h"
#include "asterisk/astobj.h"
@@ -9,7 +9,7 @@
#define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
/*! Global jitterbuffer configuration - by default, jb is disabled */
-@@ -702,6 +704,7 @@ static const struct ast_channel_tech zap
+@@ -703,6 +705,7 @@ static const struct ast_channel_tech zap
.fixup = zt_fixup,
.setoption = zt_setoption,
.func_channel_read = zt_func_read,
@@ -17,7 +17,7 @@
};
#ifdef HAVE_PRI
-@@ -760,6 +763,112 @@ static int cidrings[NUM_CADENCE_MAX] = {
+@@ -761,6 +764,112 @@ static int cidrings[NUM_CADENCE_MAX] = {
#define CANBUSYDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __ZT_SIG_FXO) */)
#define CANPROGRESSDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __ZT_SIG_FXO) */)
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Thu Dec 20 05:37:00 2007
@@ -1,6 +1,6 @@
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
-@@ -76,6 +76,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -77,6 +77,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifdef HAVE_PRI
#include <libpri.h>
#endif
@@ -10,7 +10,7 @@
#include "asterisk/lock.h"
#include "asterisk/channel.h"
-@@ -186,6 +189,7 @@ static const char config[] = "zapata.con
+@@ -187,6 +190,7 @@ static const char config[] = "zapata.con
#define SIG_FXOGS ZT_SIG_FXOGS
#define SIG_FXOKS ZT_SIG_FXOKS
#define SIG_PRI ZT_SIG_CLEAR
@@ -18,7 +18,7 @@
#define SIG_SF ZT_SIG_SF
#define SIG_SFWINK (0x0100000 | ZT_SIG_SF)
#define SIG_SF_FEATD (0x0200000 | ZT_SIG_SF)
-@@ -235,6 +239,8 @@ static int matchdigittimeout = 3000;
+@@ -236,6 +240,8 @@ static int matchdigittimeout = 3000;
/*! \brief Protect the interface list (of zt_pvt's) */
AST_MUTEX_DEFINE_STATIC(iflock);
@@ -27,7 +27,7 @@
static int ifcount = 0;
-@@ -250,7 +256,7 @@ static int restart_monitor(void);
+@@ -251,7 +257,7 @@ static int restart_monitor(void);
static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
@@ -36,7 +36,7 @@
/*! \brief Avoid the silly zt_getevent which ignores a bunch of events */
-@@ -365,6 +371,19 @@ struct zt_pri {
+@@ -366,6 +372,19 @@ struct zt_pri {
int debugfd;
};
@@ -56,7 +56,7 @@
static struct zt_pri pris[NUM_SPANS];
-@@ -393,6 +412,7 @@ struct zt_pri;
+@@ -394,6 +413,7 @@ struct zt_pri;
#define POLARITY_REV 1
@@ -64,7 +64,7 @@
static struct zt_distRings drings;
struct distRingData {
-@@ -604,6 +624,9 @@ static struct zt_pvt {
+@@ -605,6 +625,9 @@ static struct zt_pvt {
int prioffset;
int logicalspan;
#endif
@@ -74,7 +74,7 @@
int polarity;
int dsp_features;
char begindigit;
-@@ -710,7 +733,7 @@ static struct zt_chan_conf zt_chan_conf_
+@@ -711,7 +734,7 @@ static struct zt_chan_conf zt_chan_conf_
static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause);
static int zt_digit_begin(struct ast_channel *ast, char digit);
static int zt_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
@@ -83,7 +83,7 @@
static int zt_call(struct ast_channel *ast, char *rdest, int timeout);
static int zt_hangup(struct ast_channel *ast);
static int zt_answer(struct ast_channel *ast);
-@@ -1369,6 +1392,8 @@ static char *zap_sig2str(int sig)
+@@ -1370,6 +1393,8 @@ static char *zap_sig2str(int sig)
return "GR-303 with FXOKS";
case SIG_GR303FXSKS:
return "GR-303 with FXSKS";
@@ -92,7 +92,7 @@
case 0:
return "Pseudo";
default:
-@@ -1790,7 +1815,7 @@ static inline int zt_confmute(struct zt_
+@@ -1791,7 +1816,7 @@ static inline int zt_confmute(struct zt_
{
int x, y, res;
x = muted;
@@ -101,7 +101,7 @@
y = 1;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &y);
if (res)
-@@ -2205,6 +2230,25 @@ static int zt_call(struct ast_channel *a
+@@ -2206,6 +2231,25 @@ static int zt_call(struct ast_channel *a
p->dialdest[0] = '\0';
disable_dtmf_detect(p);
break;
@@ -127,7 +127,7 @@
default:
ast_log(LOG_DEBUG, "not yet implemented\n");
ast_mutex_unlock(&p->lock);
-@@ -2844,7 +2888,13 @@ static int zt_hangup(struct ast_channel
+@@ -2845,7 +2889,13 @@ static int zt_hangup(struct ast_channel
}
}
#endif
@@ -142,7 +142,7 @@
res = zt_set_hook(p->subs[SUB_REAL].zfd, ZT_ONHOOK);
if (res < 0) {
ast_log(LOG_WARNING, "Unable to hangup line %s\n", ast->name);
-@@ -3021,6 +3071,13 @@ static int zt_answer(struct ast_channel
+@@ -3022,6 +3072,13 @@ static int zt_answer(struct ast_channel
zt_train_ec(p);
break;
#endif
@@ -156,7 +156,7 @@
case 0:
ast_mutex_unlock(&p->lock);
return 0;
-@@ -7371,6 +7428,10 @@ static int pri_create_spanmap(int span,
+@@ -7384,6 +7441,10 @@ static int pri_create_spanmap(int span,
#endif
@@ -167,7 +167,7 @@
static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pri *pri, int reloading)
{
/* Make a zt_pvt structure for this interface (or CRV if "pri" is specified) */
-@@ -7599,6 +7660,37 @@ static struct zt_pvt *mkintf(int channel
+@@ -7612,6 +7673,37 @@ static struct zt_pvt *mkintf(int channel
tmp->prioffset = 0;
}
#endif
@@ -205,7 +205,7 @@
} else {
conf.chan.sig = tmp->sig;
conf.chan.radio = tmp->radio;
-@@ -7882,6 +7974,12 @@ static inline int available(struct zt_pv
+@@ -7895,6 +7987,12 @@ static inline int available(struct zt_pv
return 1;
}
#endif
@@ -218,7 +218,7 @@
if (!(p->radio || (p->oprmode < 0)))
{
if (!p->sig || (p->sig == SIG_FXSLS))
-@@ -8236,6 +8334,235 @@ next:
+@@ -8249,6 +8347,235 @@ next:
return tmp;
}
@@ -454,7 +454,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8511,6 +8838,18 @@ static void zt_pri_error(char *s, int sp
+@@ -8524,6 +8851,18 @@ static void zt_pri_error(char *s, int sp
ast_log(LOG_WARNING, "%d %s", span, s);
}
@@ -473,7 +473,7 @@
static int pri_check_restart(struct zt_pri *pri)
{
if ((pri->nodetype != PRI_NETWORK) && (pri->nodetype != PRI_CPE)) {
-@@ -10911,6 +11250,243 @@ static int app_zapInband(struct ast_chan
+@@ -10928,6 +11267,243 @@ static int app_zapInband(struct ast_chan
#endif /* HAVE_PRI */
@@ -717,7 +717,7 @@
static int app_zapEC(struct ast_channel *chan, void *data)
{
int res=-1;
-@@ -11532,6 +12108,12 @@ static int __unload_module(void)
+@@ -11549,6 +12125,12 @@ static int __unload_module(void)
ast_unregister_application(zapCD_app);
ast_unregister_application(zapInband_app);
#endif
@@ -730,7 +730,7 @@
ast_cli_unregister_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
ast_unregister_application(zapEC_app);
ast_manager_unregister( "ZapDialOffhook" );
-@@ -12052,6 +12634,11 @@ static int process_zap(struct zt_chan_co
+@@ -12069,6 +12651,11 @@ static int process_zap(struct zt_chan_co
confp->chan.radio = 0;
confp->pri.nodetype = BRI_CPE;
#endif
@@ -742,7 +742,7 @@
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
}
-@@ -12194,6 +12781,10 @@ static int process_zap(struct zt_chan_co
+@@ -12211,6 +12798,10 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.nocid, v->value, sizeof(confp->pri.nocid));
} else if (!strcasecmp(v->name, "withheldcid")) {
ast_copy_string(confp->pri.withheldcid, v->value, sizeof(confp->pri.withheldcid));
@@ -753,7 +753,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -12548,6 +13139,10 @@ static int load_module(void)
+@@ -12565,6 +13156,10 @@ static int load_module(void)
ast_register_application(zap_send_keypad_facility_app, zap_send_keypad_facility_exec,
zap_send_keypad_facility_synopsis, zap_send_keypad_facility_descrip);
#endif
@@ -764,7 +764,7 @@
res = setup_zap(0);
/* Make sure we can register our Zap channel type */
if (res)
-@@ -12566,6 +13161,12 @@ static int load_module(void)
+@@ -12583,6 +13178,12 @@ static int load_module(void)
#endif
ast_register_application(zapEC_app, app_zapEC, zapEC_synopsis, zapEC_tdesc);
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
@@ -777,7 +777,7 @@
memset(round_robin, 0, sizeof(round_robin));
ast_manager_register( "ZapTransfer", 0, action_transfer, "Transfer Zap Channel" );
-@@ -12579,7 +13180,48 @@ static int load_module(void)
+@@ -12596,7 +13197,48 @@ static int load_module(void)
return res;
}
@@ -829,7 +829,7 @@
#define HEADER_MS 50
--- a/configure.ac
+++ b/configure.ac
-@@ -176,6 +176,7 @@ AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capa
+@@ -173,6 +173,7 @@ AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capa
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal'])
@@ -839,7 +839,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
--- a/configure
+++ b/configure
-@@ -25222,6 +25222,188 @@ echo "$as_me: *** without explicitly spe
+@@ -25562,6 +25562,188 @@ echo "$as_me: *** without explicitly spe
fi
fi
Modified: asterisk/trunk/debian/patches/configure-libc-client
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/configure-libc-client?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/configure-libc-client (original)
+++ asterisk/trunk/debian/patches/configure-libc-client Thu Dec 20 05:37:00 2007
@@ -6,7 +6,7 @@
--- a/configure
+++ b/configure
-@@ -18468,7 +18468,7 @@ echo $ECHO_N "checking for UW IMAP Toolk
+@@ -18673,7 +18673,7 @@ echo $ECHO_N "checking for UW IMAP Toolk
imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
fi
CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
@@ -15,7 +15,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18660,7 +18660,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -18865,7 +18865,7 @@ rm -f core conftest.err conftest.$ac_obj
if test "${ac_cv_imap_tk}" = "yes"; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
@@ -26,7 +26,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -485,7 +485,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -483,7 +483,7 @@ if test "${USE_IMAP_TK}" != "no"; then
imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
fi
CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
@@ -35,7 +35,7 @@
AC_LINK_IFELSE(
AC_LANG_PROGRAM(
[#include "c-client.h"
-@@ -602,7 +602,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -600,7 +600,7 @@ if test "${USE_IMAP_TK}" != "no"; then
LIBS="${saved_libs}"
if test "${ac_cv_imap_tk}" = "yes"; then
AC_MSG_RESULT(yes)
Modified: asterisk/trunk/debian/patches/fix-chan-iax2-segfault
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/fix-chan-iax2-segfault?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/fix-chan-iax2-segfault (original)
+++ asterisk/trunk/debian/patches/fix-chan-iax2-segfault Thu Dec 20 05:37:00 2007
@@ -5,7 +5,7 @@
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
-@@ -2696,7 +2696,7 @@
+@@ -2696,7 +2696,7 @@ static struct iax2_peer *realtime_peer(c
}
}
}
Modified: asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-workaround-openh323-segfault?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-workaround-openh323-segfault (original)
+++ asterisk/trunk/debian/patches/h323-workaround-openh323-segfault Thu Dec 20 05:37:00 2007
@@ -15,7 +15,7 @@
--- a/main/loader.c
+++ b/main/loader.c
-@@ -356,6 +356,12 @@ static struct ast_module *load_dynamic_m
+@@ -359,6 +359,12 @@ static struct ast_module *load_dynamic_m
strcpy(resource_being_loaded->resource, resource);
Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Thu Dec 20 05:37:00 2007
@@ -5,7 +5,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -379,7 +379,6 @@ dist-clean: distclean
+@@ -387,7 +387,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) clean
@$(MAKE) -C menuselect dist-clean
@@ -13,7 +13,7 @@
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status
-@@ -389,6 +388,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) clean
+@@ -397,6 +396,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) clean
rm -rf doc/api
rm -f build_tools/menuselect-deps
Modified: asterisk/trunk/debian/patches/pubkey_jnctn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/pubkey_jnctn?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn (original)
+++ asterisk/trunk/debian/patches/pubkey_jnctn Thu Dec 20 05:37:00 2007
@@ -23,7 +23,7 @@
+-----END PUBLIC KEY-----
--- a/Makefile
+++ b/Makefile
-@@ -457,8 +457,7 @@ bininstall: _all
+@@ -465,8 +465,7 @@ bininstall: _all
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
Modified: asterisk/trunk/debian/patches/tos-libcap
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/tos-libcap?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/tos-libcap (original)
+++ asterisk/trunk/debian/patches/tos-libcap Thu Dec 20 05:37:00 2007
@@ -9,7 +9,7 @@
--- a/configure
+++ b/configure
-@@ -724,6 +724,10 @@ CURL_LIB
+@@ -725,6 +725,10 @@ CURL_LIB
CURL_INCLUDE
CURL_DIR
PBX_CURL
@@ -20,7 +20,7 @@
CURSES_LIB
CURSES_INCLUDE
CURSES_DIR
-@@ -1504,6 +1508,7 @@ Optional Packages:
+@@ -1507,6 +1511,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-asound=PATH use Advanced Linux Sound Architecture files in PATH
--with-curl=PATH use cURL files in PATH
@@ -28,7 +28,7 @@
--with-curses=PATH use curses files in PATH
--with-gnutls=PATH use GNU TLS support (used for iksemel only) files in
PATH
-@@ -7635,6 +7640,34 @@ PBX_CURL=0
+@@ -7693,6 +7698,34 @@ PBX_CURL=0
@@ -63,7 +63,7 @@
CURSES_DESCRIP="curses"
CURSES_OPTION="curses"
-@@ -16967,6 +17000,417 @@ echo "$as_me: *** without explicitly spe
+@@ -17132,6 +17165,417 @@ echo "$as_me: *** without explicitly spe
fi
@@ -481,7 +481,7 @@
GSM_INTERNAL="yes"
GSM_SYSTEM="yes"
-@@ -33705,6 +34149,10 @@ CURL_LIB!$CURL_LIB$ac_delim
+@@ -34220,6 +34664,10 @@ CURL_LIB!$CURL_LIB$ac_delim
CURL_INCLUDE!$CURL_INCLUDE$ac_delim
CURL_DIR!$CURL_DIR$ac_delim
PBX_CURL!$PBX_CURL$ac_delim
@@ -492,7 +492,7 @@
CURSES_LIB!$CURSES_LIB$ac_delim
CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
CURSES_DIR!$CURSES_DIR$ac_delim
-@@ -33790,10 +34238,6 @@ PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
+@@ -34305,10 +34753,6 @@ PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
PWLIB_DIR!$PWLIB_DIR$ac_delim
PBX_PWLIB!$PBX_PWLIB$ac_delim
OPENH323_LIB!$OPENH323_LIB$ac_delim
@@ -503,7 +503,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -33835,6 +34279,10 @@ _ACEOF
+@@ -34350,6 +34794,10 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -514,7 +514,7 @@
QT_INCLUDE!$QT_INCLUDE$ac_delim
QT_DIR!$QT_DIR$ac_delim
PBX_QT!$PBX_QT$ac_delim
-@@ -33928,12 +34376,53 @@ GTK_LIB!$GTK_LIB$ac_delim
+@@ -34443,12 +34891,53 @@ GTK_LIB!$GTK_LIB$ac_delim
PKGCONFIG!$PKGCONFIG$ac_delim
PBX_GTK2!$PBX_GTK2$ac_delim
GTK2_INCLUDE!$GTK2_INCLUDE$ac_delim
@@ -569,7 +569,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -33951,8 +34440,8 @@ if test -n "$ac_eof"; then
+@@ -34466,8 +34955,8 @@ if test -n "$ac_eof"; then
fi
cat >>$CONFIG_STATUS <<_ACEOF
@@ -580,7 +580,7 @@
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-@@ -33965,6 +34454,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
+@@ -34480,6 +34969,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
@@ -589,7 +589,7 @@
CEOF$ac_eof
_ACEOF
-@@ -34212,7 +34703,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
+@@ -34727,7 +35218,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
@@ -600,7 +600,7 @@
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
--- a/configure.ac
+++ b/configure.ac
-@@ -172,6 +172,7 @@ AC_SUBST(AST_DEVMODE)
+@@ -169,6 +169,7 @@ AC_SUBST(AST_DEVMODE)
AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
@@ -608,7 +608,7 @@
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal'])
-@@ -396,6 +397,10 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
+@@ -394,6 +395,10 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
@@ -711,7 +711,7 @@
AST_LIBS+=$(EDITLINE_LIB) -lm
--- a/makeopts.in
+++ b/makeopts.in
-@@ -178,6 +178,9 @@ MISDN_LIB=@MISDN_LIB@
+@@ -179,6 +179,9 @@ MISDN_LIB=@MISDN_LIB@
SUPPSERV_INCLUDE=@SUPPSERV_INCLUDE@
SUPPSERV_LIB=@SUPPSERV_LIB@
@@ -723,7 +723,7 @@
TERMCAP_DIR=@TERMCAP_DIR@
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
-@@ -59,6 +59,12 @@
+@@ -62,6 +62,12 @@
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
Modified: asterisk/trunk/debian/patches/vpb-driver-4.2.18
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/vpb-driver-4.2.18?rev=5109&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/vpb-driver-4.2.18 (original)
+++ asterisk/trunk/debian/patches/vpb-driver-4.2.18 Thu Dec 20 05:37:00 2007
@@ -862,7 +862,7 @@
+;channel=3
--- a/channels/Makefile
+++ b/channels/Makefile
-@@ -117,5 +117,3 @@ misdn_config.o: ASTCFLAGS+=-Imisdn
+@@ -123,5 +123,3 @@ misdn_config.o: ASTCFLAGS+=-Imisdn
misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing
$(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
More information about the Pkg-voip-commits
mailing list