[Pkg-voip-commits] r4160 - in asterisk/trunk/debian/patches: . bristuff
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon Aug 20 04:01:58 UTC 2007
Author: paravoid
Date: 2007-08-20 04:01:58 +0000 (Mon, 20 Aug 2007)
New Revision: 4160
Modified:
asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows
asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
asterisk/trunk/debian/patches/bristuff/ast-send-message
asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
asterisk/trunk/debian/patches/bristuff/feature-autoanswer
asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
asterisk/trunk/debian/patches/bristuff/xagi
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/make-clean-fixes
asterisk/trunk/debian/patches/use-libpri-bristuffed
Log:
Run 'quilt refresh' on each of the patches with hunk mismatches (ugh)
Modified: asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows
===================================================================
--- asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,6 +1,6 @@
---- asterisk-1.4.8~dfsg.orig/apps/app_meetme.c
-+++ asterisk-1.4.8~dfsg/apps/app_meetme.c
-@@ -1392,8 +1392,9 @@ static int conf_run(struct ast_channel *
+--- asterisk-1.4.10.1~dfsg.orig/apps/app_meetme.c
++++ asterisk-1.4.10.1~dfsg/apps/app_meetme.c
+@@ -1397,8 +1397,9 @@ static int conf_run(struct ast_channel *
char members[10] = "";
int dtmf, opt_waitmarked_timeout = 0;
time_t timeout = 0;
@@ -11,7 +11,7 @@
char *buf = __buf + AST_FRIENDLY_OFFSET;
if (!(user = ast_calloc(1, sizeof(*user))))
-@@ -1585,7 +1586,7 @@ static int conf_run(struct ast_channel *
+@@ -1590,7 +1591,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;
-@@ -1901,6 +1902,14 @@ static int conf_run(struct ast_channel *
+@@ -1906,6 +1907,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
===================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/include/asterisk/devicestate.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/devicestate.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/devicestate.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/devicestate.h
@@ -47,7 +47,7 @@ extern "C" {
#define AST_DEVICE_ONHOLD 8
@@ -18,8 +18,8 @@
/*! \brief Registers a device state change callback
* \param callback Callback
---- asterisk-1.4.8~dfsg.orig/main/devicestate.c
-+++ asterisk-1.4.8~dfsg/main/devicestate.c
+--- asterisk-1.4.10.1~dfsg.orig/main/devicestate.c
++++ asterisk-1.4.10.1~dfsg/main/devicestate.c
@@ -78,6 +78,8 @@ static AST_LIST_HEAD_STATIC(devstate_cbs
struct state_change {
@@ -111,8 +111,8 @@
free(cur);
AST_LIST_LOCK(&state_changes);
} else {
---- asterisk-1.4.8~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/channel.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/channel.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/channel.h
@@ -572,8 +572,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);
@@ -128,9 +128,9 @@
/*! \brief Create a channel structure
\return Returns NULL on failure to allocate.
---- asterisk-1.4.8~dfsg.orig/main/channel.c
-+++ asterisk-1.4.8~dfsg/main/channel.c
-@@ -1261,7 +1261,7 @@ void ast_channel_free(struct ast_channel
+--- asterisk-1.4.10.1~dfsg.orig/main/channel.c
++++ asterisk-1.4.10.1~dfsg/main/channel.c
+@@ -1269,7 +1269,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)
-@@ -3823,7 +3823,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3844,7 +3844,7 @@ void ast_set_callerid(struct ast_channel
);
}
@@ -148,7 +148,7 @@
{
int oldstate = chan->_state;
-@@ -3831,7 +3831,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3852,7 +3852,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",
-@@ -3848,6 +3848,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3869,6 +3869,11 @@ int ast_setstate(struct ast_channel *cha
return 0;
}
@@ -169,8 +169,8 @@
/*! \brief Find bridged channel */
struct ast_channel *ast_bridged_channel(struct ast_channel *chan)
{
---- asterisk-1.4.8~dfsg.orig/include/asterisk/pbx.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/pbx.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/pbx.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/pbx.h
@@ -63,7 +63,7 @@ struct ast_ignorepat;
struct ast_sw;
@@ -189,8 +189,8 @@
#if defined(__cplusplus) || defined(c_plusplus)
}
---- asterisk-1.4.8~dfsg.orig/main/pbx.c
-+++ asterisk-1.4.8~dfsg/main/pbx.c
+--- asterisk-1.4.10.1~dfsg.orig/main/pbx.c
++++ asterisk-1.4.10.1~dfsg/main/pbx.c
@@ -1993,7 +1993,7 @@ int ast_extension_state(struct ast_chann
return ast_extension_state2(e); /* Check all devices in the hint */
}
@@ -232,8 +232,8 @@
free(prevcb);
}
} else {
---- asterisk-1.4.8~dfsg.orig/channels/chan_sip.c
-+++ asterisk-1.4.8~dfsg/channels/chan_sip.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_sip.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_sip.c
@@ -1328,7 +1328,7 @@ static void ast_quiet_chan(struct ast_ch
static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target);
@@ -243,7 +243,7 @@
static int sip_devicestate(void *data);
static int sip_poke_noanswer(void *data);
static int sip_poke_peer(struct sip_peer *peer);
-@@ -8282,7 +8282,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8337,7 +8337,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 */
@@ -252,9 +252,9 @@
{
struct sip_pvt *p = data;
---- asterisk-1.4.8~dfsg.orig/apps/app_queue.c
-+++ asterisk-1.4.8~dfsg/apps/app_queue.c
-@@ -592,7 +592,7 @@ static void *changethread(void *data)
+--- asterisk-1.4.10.1~dfsg.orig/apps/app_queue.c
++++ asterisk-1.4.10.1~dfsg/apps/app_queue.c
+@@ -594,7 +594,7 @@ static void *changethread(void *data)
return NULL;
}
@@ -263,8 +263,8 @@
{
/* Avoid potential for deadlocks by spawning a new thread to handle
the event */
---- asterisk-1.4.8~dfsg.orig/include/asterisk/manager.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/manager.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/manager.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/manager.h
@@ -55,6 +55,7 @@
#define EVENT_FLAG_AGENT (1 << 5) /* Ability to read/set agent info */
#define EVENT_FLAG_USER (1 << 6) /* Ability to read/set user info */
@@ -273,8 +273,8 @@
/* Export manager structures */
#define AST_MAX_MANHEADERS 128
---- asterisk-1.4.8~dfsg.orig/main/manager.c
-+++ asterisk-1.4.8~dfsg/main/manager.c
+--- asterisk-1.4.10.1~dfsg.orig/main/manager.c
++++ asterisk-1.4.10.1~dfsg/main/manager.c
@@ -128,6 +128,7 @@ static struct permalias {
{ EVENT_FLAG_AGENT, "agent" },
{ EVENT_FLAG_USER, "user" },
@@ -298,8 +298,8 @@
return 0;
}
---- asterisk-1.4.8~dfsg.orig/apps/app_devstate.c
-+++ asterisk-1.4.8~dfsg/apps/app_devstate.c
+--- asterisk-1.4.10.1~dfsg.orig/apps/app_devstate.c
++++ asterisk-1.4.10.1~dfsg/apps/app_devstate.c
@@ -50,7 +50,7 @@ static struct ast_cli_entry cli_dev_sta
static int devstate_cli(int fd, int argc, char *argv[])
{
@@ -353,8 +353,8 @@
astman_append(s, "Response: Success\r\n%s\r\n", idText);
} else {
ast_log(LOG_DEBUG, "ast_db_put failed\n");
---- asterisk-1.4.8~dfsg.orig/res/res_esel.c
-+++ asterisk-1.4.8~dfsg/res/res_esel.c
+--- asterisk-1.4.10.1~dfsg.orig/res/res_esel.c
++++ asterisk-1.4.10.1~dfsg/res/res_esel.c
@@ -51,6 +51,8 @@ typedef struct esel_extension_state {
char context[AST_MAX_EXTENSION];
char exten[AST_MAX_EXTENSION];
Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message
===================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,8 +1,8 @@
Change the API of ast_sendtext and chan->sendtext to add dest and ispdu
parameters, used by ast_send_message which is also introduced by this patch.
---- asterisk-1.4.8~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/channel.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/channel.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/channel.h
@@ -223,7 +223,7 @@ struct ast_channel_tech {
int (* const write)(struct ast_channel *chan, struct ast_frame *frame);
@@ -43,9 +43,9 @@
/*! \brief Receives a text character from a channel
* \param chan channel to act upon
---- asterisk-1.4.8~dfsg.orig/main/channel.c
-+++ asterisk-1.4.8~dfsg/main/channel.c
-@@ -2634,7 +2634,7 @@ char *ast_recvtext(struct ast_channel *c
+--- asterisk-1.4.10.1~dfsg.orig/main/channel.c
++++ asterisk-1.4.10.1~dfsg/main/channel.c
+@@ -2655,7 +2655,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 */
-@@ -2642,7 +2642,7 @@ int ast_sendtext(struct ast_channel *cha
+@@ -2663,7 +2663,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;
}
-@@ -2811,7 +2811,7 @@ int ast_write(struct ast_channel *chan,
+@@ -2832,7 +2832,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 :
-@@ -4786,6 +4786,25 @@ void ast_channel_stop_silence_generator(
+@@ -4807,6 +4807,25 @@ void ast_channel_stop_silence_generator(
}
@@ -98,8 +98,8 @@
/*! \ brief Convert channel reloadreason (ENUM) to text string for manager event */
const char *channelreloadreason2txt(enum channelreloadreason reason)
{
---- asterisk-1.4.8~dfsg.orig/apps/app_sendtext.c
-+++ asterisk-1.4.8~dfsg/apps/app_sendtext.c
+--- asterisk-1.4.10.1~dfsg.orig/apps/app_sendtext.c
++++ asterisk-1.4.10.1~dfsg/apps/app_sendtext.c
@@ -103,7 +103,7 @@ static int sendtext_exec(struct ast_chan
}
status = "FAILURE";
@@ -109,9 +109,9 @@
if (!res)
status = "SUCCESS";
pbx_builtin_setvar_helper(chan, "SENDTEXTSTATUS", status);
---- asterisk-1.4.8~dfsg.orig/res/res_agi.c
-+++ asterisk-1.4.8~dfsg/res/res_agi.c
-@@ -481,7 +481,7 @@ static int handle_sendtext(struct ast_ch
+--- asterisk-1.4.10.1~dfsg.orig/res/res_agi.c
++++ asterisk-1.4.10.1~dfsg/res/res_agi.c
+@@ -483,7 +483,7 @@ static int handle_sendtext(struct ast_ch
would probably be to strip off the trailing newline before
parsing, then here, add a newline at the end of the string
before sending it to ast_sendtext --DUDE */
@@ -120,8 +120,8 @@
fdprintf(agi->fd, "200 result=%d\n", res);
return (res >= 0) ? RESULT_SUCCESS : RESULT_FAILURE;
}
---- asterisk-1.4.8~dfsg.orig/channels/chan_agent.c
-+++ asterisk-1.4.8~dfsg/channels/chan_agent.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_agent.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_agent.c
@@ -246,7 +246,7 @@ static int agent_answer(struct ast_chann
static struct ast_frame *agent_read(struct ast_channel *ast);
static int agent_write(struct ast_channel *ast, struct ast_frame *f);
@@ -147,8 +147,8 @@
ast_mutex_unlock(&p->lock);
return res;
}
---- asterisk-1.4.8~dfsg.orig/channels/chan_alsa.c
-+++ asterisk-1.4.8~dfsg/channels/chan_alsa.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_alsa.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_alsa.c
@@ -186,7 +186,7 @@ static int nosound = 0;
/* ZZ */
static struct ast_channel *alsa_request(const char *type, int format, void *data, int *cause);
@@ -167,8 +167,8 @@
{
ast_mutex_lock(&alsalock);
ast_verbose(" << Console Received text %s >> \n", text);
---- asterisk-1.4.8~dfsg.orig/channels/chan_local.c
-+++ asterisk-1.4.8~dfsg/channels/chan_local.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_local.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_local.c
@@ -77,7 +77,7 @@ static int local_write(struct ast_channe
static int local_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen);
static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
@@ -187,8 +187,8 @@
{
struct local_pvt *p = ast->tech_pvt;
int res = -1;
---- asterisk-1.4.8~dfsg.orig/channels/chan_oss.c
-+++ asterisk-1.4.8~dfsg/channels/chan_oss.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_oss.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_oss.c
@@ -405,7 +405,7 @@ static struct ast_channel *oss_request(c
, int *cause);
static int oss_digit_begin(struct ast_channel *c, char digit);
@@ -207,8 +207,8 @@
{
/* print received messages */
ast_verbose(" << Console Received text %s >> \n", text);
---- asterisk-1.4.8~dfsg.orig/channels/chan_phone.c
-+++ asterisk-1.4.8~dfsg/channels/chan_phone.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_phone.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_phone.c
@@ -166,7 +166,7 @@ static int phone_answer(struct ast_chann
static struct ast_frame *phone_read(struct ast_channel *ast);
static int phone_write(struct ast_channel *ast, struct ast_frame *frame);
@@ -227,8 +227,8 @@
{
int length = strlen(text);
return phone_write_buf(ast->tech_pvt, text, length, length, 0) ==
---- asterisk-1.4.8~dfsg.orig/channels/chan_sip.c
-+++ asterisk-1.4.8~dfsg/channels/chan_sip.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_sip.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_sip.c
@@ -1204,7 +1204,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);
@@ -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);
-@@ -2315,7 +2315,7 @@ static char *get_in_brackets(char *tmp)
+@@ -2316,7 +2316,7 @@ static char *get_in_brackets(char *tmp)
/*! \brief Send SIP MESSAGE text within a call
Called from PBX core sendtext() application */
@@ -247,9 +247,9 @@
{
struct sip_pvt *p = ast->tech_pvt;
int debug = sip_debug_test_pvt(p);
---- asterisk-1.4.8~dfsg.orig/channels/chan_iax2.c
-+++ asterisk-1.4.8~dfsg/channels/chan_iax2.c
-@@ -812,7 +812,7 @@ static int iax2_provision(struct sockadd
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_iax2.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_iax2.c
+@@ -817,7 +817,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);
-@@ -2464,7 +2464,7 @@ static int iax2_digit_end(struct ast_cha
+@@ -2476,7 +2476,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_monitor_start-targetscript
===================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/include/asterisk/monitor.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/monitor.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/monitor.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/monitor.h
@@ -38,6 +38,8 @@ struct ast_channel_monitor {
char write_filename[FILENAME_MAX];
char filename_base[FILENAME_MAX];
@@ -18,8 +18,8 @@
/* Stop monitoring a channel */
int ast_monitor_stop(struct ast_channel *chan, int need_lock);
---- asterisk-1.4.8~dfsg.orig/res/res_monitor.c
-+++ asterisk-1.4.8~dfsg/res/res_monitor.c
+--- asterisk-1.4.10.1~dfsg.orig/res/res_monitor.c
++++ asterisk-1.4.10.1~dfsg/res/res_monitor.c
@@ -124,7 +124,7 @@ static int ast_monitor_set_state(struct
/* Start monitoring a channel */
@@ -93,9 +93,9 @@
if (ast_monitor_change_fname(c, fname, 1)) {
astman_send_error(s, m, "Could not start monitoring channel");
ast_channel_unlock(c);
---- asterisk-1.4.8~dfsg.orig/apps/app_queue.c
-+++ asterisk-1.4.8~dfsg/apps/app_queue.c
-@@ -2528,13 +2528,13 @@ static int try_calling(struct queue_ent
+--- asterisk-1.4.10.1~dfsg.orig/apps/app_queue.c
++++ asterisk-1.4.10.1~dfsg/apps/app_queue.c
+@@ -2583,13 +2583,13 @@ static int try_calling(struct queue_ent
else
which = peer;
if (monitorfilename)
@@ -112,8 +112,8 @@
}
if (qe->parent->monjoin)
ast_monitor_setjoinfiles(which, 1);
---- asterisk-1.4.8~dfsg.orig/channels/chan_agent.c
-+++ asterisk-1.4.8~dfsg/channels/chan_agent.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_agent.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_agent.c
@@ -412,7 +412,7 @@ static int __agent_start_monitoring(stru
if ((pointer = strchr(filename, '.')))
*pointer = '-';
Modified: asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
===================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/channels/chan_iax2.c
-+++ asterisk-1.4.8~dfsg/channels/chan_iax2.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_iax2.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_iax2.c
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -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.
-@@ -3004,7 +3007,7 @@ static int iax2_hangup(struct ast_channe
+@@ -3016,7 +3019,7 @@ static int iax2_hangup(struct ast_channe
memset(&ied, 0, sizeof(ied));
ast_mutex_lock(&iaxsl[callno]);
if (callno && iaxs[callno]) {
@@ -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);
-@@ -3052,7 +3055,8 @@ static int iax2_setoption(struct ast_cha
+@@ -3064,7 +3067,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
===================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-autoanswer 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/feature-autoanswer 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/include/asterisk/features.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/features.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/features.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/features.h
@@ -47,6 +47,8 @@ struct ast_call_feature {
};
@@ -9,8 +9,8 @@
/*! \brief Park a call and read back parked location
* \param chan the channel to actually be parked
---- asterisk-1.4.8~dfsg.orig/res/res_features.c
-+++ asterisk-1.4.8~dfsg/res/res_features.c
+--- asterisk-1.4.10.1~dfsg.orig/res/res_features.c
++++ asterisk-1.4.10.1~dfsg/res/res_features.c
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -83,7 +83,7 @@
);
if (peer && adsipark && ast_adsi_available(peer)) {
-@@ -1613,11 +1650,13 @@ static void post_manager_event(const cha
+@@ -1609,11 +1646,13 @@ static void post_manager_event(const cha
"Exten: %s\r\n"
"Channel: %s\r\n"
"CallerID: %s\r\n"
@@ -99,7 +99,7 @@
);
}
-@@ -1868,10 +1907,12 @@ static int park_exec(struct ast_channel
+@@ -1864,10 +1903,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);
-@@ -2022,15 +2063,10 @@ static struct ast_cli_entry cli_show_fea
+@@ -2018,15 +2059,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)
-@@ -2054,12 +2090,13 @@ static int manager_parking_status( struc
+@@ -2050,12 +2086,13 @@ static int manager_parking_status( struc
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
@@ -148,7 +148,7 @@
idText);
}
-@@ -2134,6 +2171,427 @@ static int manager_park(struct mansessio
+@@ -2130,6 +2167,427 @@ static int manager_park(struct mansessio
return 0;
}
@@ -576,7 +576,7 @@
int ast_pickup_call(struct ast_channel *chan)
{
-@@ -2397,6 +2855,7 @@ static int load_config(void)
+@@ -2393,6 +2851,7 @@ static int load_config(void)
static int reload(void)
{
@@ -584,7 +584,7 @@
return load_config();
}
-@@ -2420,6 +2879,12 @@ static int load_module(void)
+@@ -2416,6 +2875,12 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -597,7 +597,7 @@
res |= ast_devstate_prov_add("Park", metermaidstate);
return res;
-@@ -2434,6 +2899,8 @@ static int unload_module(void)
+@@ -2430,6 +2895,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
===================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-holdedcalls 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/feature-holdedcalls 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/include/asterisk/features.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/features.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/features.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/features.h
@@ -72,6 +72,12 @@ int ast_park_call(struct ast_channel *ch
*/
int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *host, int timeout, int *extout);
@@ -13,8 +13,8 @@
/*! \brief Determine system parking extension
* Returns the call parking extension for drivers that provide special
call parking help */
---- asterisk-1.4.8~dfsg.orig/res/res_features.c
-+++ asterisk-1.4.8~dfsg/res/res_features.c
+--- asterisk-1.4.10.1~dfsg.orig/res/res_features.c
++++ asterisk-1.4.10.1~dfsg/res/res_features.c
@@ -62,6 +62,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include "asterisk/adsi.h"
#include "asterisk/devicestate.h"
@@ -71,7 +71,7 @@
char *ast_parking_ext(void)
{
return parking_ext;
-@@ -1989,6 +2013,282 @@ static int park_exec(struct ast_channel
+@@ -1985,6 +2009,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;
-@@ -2870,6 +3170,7 @@ static int load_module(void)
+@@ -2866,6 +3166,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);
-@@ -2879,6 +3180,7 @@ static int load_module(void)
+@@ -2875,6 +3176,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);
-@@ -2901,6 +3203,7 @@ static int unload_module(void)
+@@ -2897,6 +3199,7 @@ static int unload_module(void)
ast_unregister_application(parkcall);
ast_unregister_application(autoanswer);
ast_unregister_application(autoanswerlogin);
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
===================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,7 +1,7 @@
Add or convert channel operations so they can use the unique ID.
---- asterisk-1.4.8~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/channel.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/channel.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/channel.h
@@ -641,6 +641,18 @@ void ast_channel_free(struct ast_channe
*/
struct ast_channel *ast_request(const char *type, int format, void *data, int *status);
@@ -42,8 +42,8 @@
/*! ! \brief Waits for a digit
* \param c channel to wait for a digit on
---- asterisk-1.4.8~dfsg.orig/main/channel.c
-+++ asterisk-1.4.8~dfsg/main/channel.c
+--- asterisk-1.4.10.1~dfsg.orig/main/channel.c
++++ asterisk-1.4.10.1~dfsg/main/channel.c
@@ -1027,7 +1027,7 @@ void ast_channel_undefer_dtmf(struct ast
*/
static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
@@ -53,8 +53,8 @@
{
const char *msg = prev ? "deadlock" : "initial deadlock";
int retries;
-@@ -1052,7 +1052,10 @@ static struct ast_channel *channel_find_
- * set this to NULL the logic would just blow up
+@@ -1055,7 +1055,10 @@ static struct ast_channel *channel_find_
+ * XXX Need a better explanation for this ...
*/
}
- if (name) { /* want match by name */
@@ -65,7 +65,7 @@
if ((!namelen && strcasecmp(c->name, name)) ||
(namelen && strncasecmp(c->name, name, namelen)))
continue; /* name match failed */
-@@ -1102,39 +1105,44 @@ static struct ast_channel *channel_find_
+@@ -1110,39 +1113,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 */
-@@ -1204,8 +1212,10 @@ void ast_channel_free(struct ast_channel
+@@ -1212,8 +1220,10 @@ void ast_channel_free(struct ast_channel
free(chan->tech_pvt);
}
@@ -129,7 +129,7 @@
ast_copy_string(name, chan->name, sizeof(name));
-@@ -3013,7 +3023,7 @@ int ast_set_write_format(struct ast_chan
+@@ -3034,7 +3044,7 @@ int ast_set_write_format(struct ast_chan
&chan->writetrans, 1);
}
@@ -138,7 +138,7 @@
{
int dummy_outstate;
int cause = 0;
-@@ -3025,7 +3035,7 @@ struct ast_channel *__ast_request_and_di
+@@ -3046,7 +3056,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 */
-@@ -3048,7 +3058,7 @@ struct ast_channel *__ast_request_and_di
+@@ -3069,7 +3079,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,
-@@ -3137,12 +3147,12 @@ struct ast_channel *__ast_request_and_di
+@@ -3158,12 +3168,12 @@ struct ast_channel *__ast_request_and_di
return chan;
}
@@ -172,7 +172,7 @@
{
struct chanlist *chan;
struct ast_channel *c;
-@@ -3192,6 +3202,11 @@ struct ast_channel *ast_request(const ch
+@@ -3213,6 +3223,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.
-@@ -3564,7 +3579,7 @@ int ast_do_masquerade(struct ast_channel
+@@ -3585,7 +3600,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 */
@@ -193,8 +193,8 @@
manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", orig, newn, original->uniqueid);
/* Swap the technologies */
---- asterisk-1.4.8~dfsg.orig/apps/app_parkandannounce.c
-+++ asterisk-1.4.8~dfsg/apps/app_parkandannounce.c
+--- asterisk-1.4.10.1~dfsg.orig/apps/app_parkandannounce.c
++++ asterisk-1.4.10.1~dfsg/apps/app_parkandannounce.c
@@ -182,7 +182,7 @@ static int parkandannounce_exec(struct a
memset(&oh, 0, sizeof(oh));
oh.parent_channel = chan;
@@ -204,8 +204,8 @@
if(dchan) {
if(dchan->_state == AST_STATE_UP) {
---- asterisk-1.4.8~dfsg.orig/include/asterisk/pbx.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/pbx.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/pbx.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/pbx.h
@@ -715,9 +715,17 @@ int ast_async_goto_by_name(const char *c
int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout, const char *context, const char *exten, int priority, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel);
@@ -224,8 +224,8 @@
/*!
* \brief Evaluate a condition
*
---- asterisk-1.4.8~dfsg.orig/main/pbx.c
-+++ asterisk-1.4.8~dfsg/main/pbx.c
+--- asterisk-1.4.10.1~dfsg.orig/main/pbx.c
++++ asterisk-1.4.10.1~dfsg/main/pbx.c
@@ -4957,7 +4957,7 @@ static int ast_pbx_outgoing_cdr_failed(v
return 0; /* success */
}
Modified: asterisk/trunk/debian/patches/bristuff/xagi
===================================================================
--- asterisk/trunk/debian/patches/bristuff/xagi 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/xagi 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/include/asterisk/agi.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/agi.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/agi.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/agi.h
@@ -29,7 +29,8 @@ extern "C" {
typedef struct agi_state {
@@ -10,8 +10,8 @@
int ctrl; /* FD for input control */
} AGI;
---- asterisk-1.4.8~dfsg.orig/res/res_agi.c
-+++ asterisk-1.4.8~dfsg/res/res_agi.c
+--- asterisk-1.4.10.1~dfsg.orig/res/res_agi.c
++++ asterisk-1.4.10.1~dfsg/res/res_agi.c
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -52,7 +52,7 @@
" Use the CLI command 'agi show' to list available agi commands\n"
" This application sets the following channel variable upon completion:\n"
" AGISTATUS The status of the attempt to the run the AGI script\n"
-@@ -231,13 +239,14 @@ static enum agi_result launch_netscript(
+@@ -233,13 +241,14 @@ static enum agi_result launch_netscript(
return AGI_RESULT_SUCCESS;
}
@@ -68,7 +68,7 @@
int x;
int res;
sigset_t signal_set, old_set;
-@@ -282,6 +291,33 @@ static enum agi_result launch_script(cha
+@@ -284,6 +293,33 @@ static enum agi_result launch_script(cha
return AGI_RESULT_FAILURE;
}
}
@@ -102,7 +102,7 @@
/* Block SIGHUP during the fork - prevents a race */
sigfillset(&signal_set);
-@@ -317,6 +353,11 @@ static enum agi_result launch_script(cha
+@@ -319,6 +355,11 @@ static enum agi_result launch_script(cha
} else {
close(STDERR_FILENO + 1);
}
@@ -114,7 +114,7 @@
/* Before we unblock our signals, return our trapped signals back to the defaults */
signal(SIGHUP, SIG_DFL);
-@@ -334,7 +375,7 @@ static enum agi_result launch_script(cha
+@@ -336,7 +377,7 @@ static enum agi_result launch_script(cha
}
/* Close everything but stdin/out/error */
@@ -123,7 +123,7 @@
close(x);
/* Execute script */
-@@ -352,12 +393,19 @@ static enum agi_result launch_script(cha
+@@ -354,12 +395,19 @@ static enum agi_result launch_script(cha
if (efd) {
*efd = audio[1];
}
@@ -144,7 +144,7 @@
*opid = pid;
return AGI_RESULT_SUCCESS;
-@@ -387,7 +435,7 @@ static void setup_env(struct ast_channel
+@@ -389,7 +437,7 @@ static void setup_env(struct ast_channel
fdprintf(fd, "agi_context: %s\n", chan->context);
fdprintf(fd, "agi_extension: %s\n", chan->exten);
fdprintf(fd, "agi_priority: %d\n", chan->priority);
@@ -153,7 +153,7 @@
/* User information */
fdprintf(fd, "agi_accountcode: %s\n", chan->accountcode ? chan->accountcode : "");
-@@ -416,7 +464,7 @@ static int handle_waitfordigit(struct as
+@@ -418,7 +466,7 @@ static int handle_waitfordigit(struct as
return RESULT_SHOWUSAGE;
if (sscanf(argv[3], "%d", &to) != 1)
return RESULT_SHOWUSAGE;
@@ -162,7 +162,7 @@
fdprintf(agi->fd, "200 result=%d\n", res);
return (res >= 0) ? RESULT_SUCCESS : RESULT_FAILURE;
}
-@@ -591,7 +639,7 @@ static int handle_streamfile(struct ast_
+@@ -593,7 +641,7 @@ static int handle_streamfile(struct ast_
if (vfs)
ast_playstream(vfs);
@@ -171,7 +171,7 @@
/* this is to check for if ast_waitstream closed the stream, we probably are at
* the end of the stream, return that amount, else check for the amount */
sample_offset = (chan->stream) ? ast_tellstream(fs) : max_length;
-@@ -652,7 +700,7 @@ static int handle_getoption(struct ast_c
+@@ -654,7 +702,7 @@ static int handle_getoption(struct ast_c
if (vfs)
ast_playstream(vfs);
@@ -180,7 +180,7 @@
/* this is to check for if ast_waitstream closed the stream, we probably are at
* the end of the stream, return that amount, else check for the amount */
sample_offset = (chan->stream)?ast_tellstream(fs):max_length;
-@@ -664,7 +712,7 @@ static int handle_getoption(struct ast_c
+@@ -666,7 +714,7 @@ static int handle_getoption(struct ast_c
/* If the user didnt press a key, wait for digitTimeout*/
if (res == 0 ) {
@@ -189,7 +189,7 @@
/* Make sure the new result is in the escape digits of the GET OPTION */
if ( !strchr(edigits,res) )
res=0;
-@@ -688,7 +736,7 @@ static int handle_saynumber(struct ast_c
+@@ -690,7 +738,7 @@ static int handle_saynumber(struct ast_c
return RESULT_SHOWUSAGE;
if (sscanf(argv[2], "%d", &num) != 1)
return RESULT_SHOWUSAGE;
@@ -198,7 +198,7 @@
if (res == 1)
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -705,7 +753,7 @@ static int handle_saydigits(struct ast_c
+@@ -707,7 +755,7 @@ static int handle_saydigits(struct ast_c
if (sscanf(argv[2], "%d", &num) != 1)
return RESULT_SHOWUSAGE;
@@ -207,7 +207,7 @@
if (res == 1) /* New command */
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -719,7 +767,7 @@ static int handle_sayalpha(struct ast_ch
+@@ -721,7 +769,7 @@ static int handle_sayalpha(struct ast_ch
if (argc != 4)
return RESULT_SHOWUSAGE;
@@ -216,7 +216,7 @@
if (res == 1) /* New command */
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -797,7 +845,7 @@ static int handle_sayphonetic(struct ast
+@@ -799,7 +847,7 @@ static int handle_sayphonetic(struct ast
if (argc != 4)
return RESULT_SHOWUSAGE;
@@ -225,7 +225,7 @@
if (res == 1) /* New command */
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -821,7 +869,7 @@ static int handle_getdata(struct ast_cha
+@@ -823,7 +871,7 @@ static int handle_getdata(struct ast_cha
max = atoi(argv[4]);
else
max = 1024;
@@ -234,7 +234,7 @@
if (res == 2) /* New command */
return RESULT_SUCCESS;
else if (res == 1)
-@@ -1828,7 +1876,12 @@ static enum agi_result run_agi(struct as
+@@ -1831,7 +1879,12 @@ static enum agi_result run_agi(struct as
int ms;
enum agi_result returnstatus = AGI_RESULT_SUCCESS;
struct ast_frame *f;
@@ -247,7 +247,7 @@
FILE *readf;
/* how many times we'll retry if ast_waitfor_nandfs will return without either
channel or file descriptor in case select is interrupted by a system call (EINTR) */
-@@ -1842,10 +1895,22 @@ static enum agi_result run_agi(struct as
+@@ -1845,10 +1898,22 @@ static enum agi_result run_agi(struct as
return AGI_RESULT_FAILURE;
}
setlinebuf(readf);
@@ -272,7 +272,7 @@
if (c) {
retry = RETRY;
/* Idle the channel until we get a command */
-@@ -1856,13 +1921,24 @@ static enum agi_result run_agi(struct as
+@@ -1859,13 +1924,24 @@ static enum agi_result run_agi(struct as
break;
} else {
/* If it's voice, write it to the audio pipe */
@@ -299,7 +299,7 @@
retry = RETRY;
if (!fgets(buf, sizeof(buf), readf)) {
/* Program terminated */
-@@ -1886,6 +1962,7 @@ static enum agi_result run_agi(struct as
+@@ -1889,6 +1965,7 @@ static enum agi_result run_agi(struct as
if ((returnstatus < 0) || (returnstatus == AST_PBX_KEEPALIVE)) {
break;
}
@@ -307,7 +307,7 @@
} else {
if (--retry <= 0) {
ast_log(LOG_WARNING, "No channel, no fd?\n");
-@@ -1994,6 +2071,7 @@ static int agi_exec_full(struct ast_chan
+@@ -1997,6 +2074,7 @@ static int agi_exec_full(struct ast_chan
int argc = 0;
int fds[2];
int efd = -1;
@@ -315,7 +315,7 @@
int pid;
char *stringp;
AGI agi;
-@@ -2019,12 +2097,13 @@ static int agi_exec_full(struct ast_chan
+@@ -2022,12 +2100,13 @@ static int agi_exec_full(struct ast_chan
}
}
#endif
@@ -331,7 +331,7 @@
res = run_agi(chan, argv[0], &agi, pid, &status, dead);
/* If the fork'd process returns non-zero, set AGISTATUS to FAILURE */
if (res == AGI_RESULT_SUCCESS && status)
-@@ -2033,6 +2112,8 @@ static int agi_exec_full(struct ast_chan
+@@ -2036,6 +2115,8 @@ static int agi_exec_full(struct ast_chan
close(fds[1]);
if (efd > -1)
close(efd);
@@ -340,7 +340,7 @@
ast_unreplace_sigchld();
}
ast_module_user_remove(u);
-@@ -2080,6 +2161,35 @@ static int eagi_exec(struct ast_channel
+@@ -2083,6 +2164,35 @@ static int eagi_exec(struct ast_channel
return res;
}
@@ -376,7 +376,7 @@
static int deadagi_exec(struct ast_channel *chan, void *data)
{
if (!ast_check_hangup(chan))
-@@ -2135,6 +2245,7 @@ static int unload_module(void)
+@@ -2138,6 +2248,7 @@ static int unload_module(void)
{
ast_module_user_hangup_all();
ast_cli_unregister_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
@@ -384,7 +384,7 @@
ast_unregister_application(eapp);
ast_unregister_application(deadapp);
return ast_unregister_application(app);
-@@ -2145,6 +2256,7 @@ static int load_module(void)
+@@ -2148,6 +2259,7 @@ static int load_module(void)
ast_cli_register_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
ast_register_application(deadapp, deadagi_exec, deadsynopsis, descrip);
ast_register_application(eapp, eagi_exec, esynopsis, descrip);
@@ -393,7 +393,7 @@
}
--- /dev/null
-+++ asterisk-1.4.8~dfsg/agi/xagi-test.c
++++ asterisk-1.4.10.1~dfsg/agi/xagi-test.c
@@ -0,0 +1,175 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@@ -570,8 +570,8 @@
+ return -1;
+ exit(0);
+}
---- asterisk-1.4.8~dfsg.orig/agi/Makefile
-+++ asterisk-1.4.8~dfsg/agi/Makefile
+--- asterisk-1.4.10.1~dfsg.orig/agi/Makefile
++++ asterisk-1.4.10.1~dfsg/agi/Makefile
@@ -13,7 +13,7 @@
.PHONY: clean all uninstall
Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
===================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/channel.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/channel.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/channel.h
@@ -413,6 +413,8 @@ struct ast_channel {
unsigned int flags; /*!< channel flags of AST_FLAG_ type */
unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
@@ -9,8 +9,8 @@
int alertpipe[2];
int nativeformats; /*!< Kinds of data this channel can natively handle */
---- asterisk-1.4.8~dfsg.orig/main/pbx.c
-+++ asterisk-1.4.8~dfsg/main/pbx.c
+--- asterisk-1.4.10.1~dfsg.orig/main/pbx.c
++++ asterisk-1.4.10.1~dfsg/main/pbx.c
@@ -5101,7 +5101,7 @@ struct app_tmp {
};
@@ -20,8 +20,8 @@
{
struct app_tmp *tmp = data;
struct ast_app *app;
---- asterisk-1.4.8~dfsg.orig/include/asterisk/pbx.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/pbx.h
+--- asterisk-1.4.10.1~dfsg.orig/include/asterisk/pbx.h
++++ asterisk-1.4.10.1~dfsg/include/asterisk/pbx.h
@@ -145,6 +145,8 @@ void ast_unregister_switch(struct ast_sw
*/
struct ast_app *pbx_findapp(const char *app);
@@ -31,8 +31,8 @@
/*!
* \brief Execute an application
*
---- asterisk-1.4.8~dfsg.orig/channels/chan_zap.c
-+++ asterisk-1.4.8~dfsg/channels/chan_zap.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_zap.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_zap.c
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -379,7 +379,7 @@
x = p->echotraining;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_ECHOTRAIN, &x);
if (res)
-@@ -1808,7 +1968,12 @@ static int zt_call(struct ast_channel *a
+@@ -1802,7 +1962,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;
@@ -393,7 +393,7 @@
mysig = p->sig;
if (p->outsigmod > -1)
-@@ -2039,6 +2204,7 @@ static int zt_call(struct ast_channel *a
+@@ -2033,6 +2198,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';
@@ -401,7 +401,7 @@
break;
default:
ast_log(LOG_DEBUG, "not yet implemented\n");
-@@ -2059,6 +2225,12 @@ static int zt_call(struct ast_channel *a
+@@ -2053,6 +2219,12 @@ static int zt_call(struct ast_channel *a
const char *rr_str;
int redirect_reason;
@@ -414,7 +414,7 @@
c = strchr(dest, '/');
if (c)
c++;
-@@ -2080,6 +2252,7 @@ static int zt_call(struct ast_channel *a
+@@ -2074,6 +2246,7 @@ static int zt_call(struct ast_channel *a
ast_mutex_unlock(&p->lock);
return -1;
}
@@ -422,7 +422,7 @@
if (mysig != SIG_FXSKS) {
p->dop.op = ZT_DIAL_OP_REPLACE;
s = strchr(c + p->stripmsd, 'w');
-@@ -2103,6 +2276,8 @@ static int zt_call(struct ast_channel *a
+@@ -2097,6 +2270,8 @@ static int zt_call(struct ast_channel *a
pri_rel(p->pri);
ast_mutex_unlock(&p->lock);
return -1;
@@ -431,7 +431,7 @@
}
if (!(sr = pri_sr_new())) {
ast_log(LOG_WARNING, "Failed to allocate setup request channel %d\n", p->channel);
-@@ -2132,7 +2307,7 @@ static int zt_call(struct ast_channel *a
+@@ -2126,7 +2301,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 :
@@ -440,7 +440,7 @@
if (p->pri->facilityenable)
pri_facility_enable(p->pri->pri);
-@@ -2396,8 +2571,10 @@ static int pri_find_dchan(struct zt_pri
+@@ -2390,8 +2565,10 @@ static int pri_find_dchan(struct zt_pri
}
if (newslot < 0) {
newslot = 0;
@@ -452,7 +452,7 @@
}
if (old && (oldslot != newslot))
ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n",
-@@ -2407,6 +2584,16 @@ static int pri_find_dchan(struct zt_pri
+@@ -2401,6 +2578,16 @@ static int pri_find_dchan(struct zt_pri
}
#endif
@@ -469,7 +469,7 @@
static int zt_hangup(struct ast_channel *ast)
{
int res;
-@@ -2454,8 +2641,7 @@ static int zt_hangup(struct ast_channel
+@@ -2448,8 +2635,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);
@@ -479,7 +479,7 @@
if (index > -1) {
/* Real channel, do some fixup */
p->subs[index].owner = NULL;
-@@ -2557,6 +2743,7 @@ static int zt_hangup(struct ast_channel
+@@ -2551,6 +2737,7 @@ static int zt_hangup(struct ast_channel
}
if (!p->subs[SUB_REAL].owner && !p->subs[SUB_CALLWAIT].owner && !p->subs[SUB_THREEWAY].owner) {
@@ -487,7 +487,7 @@
p->owner = NULL;
p->ringt = 0;
p->distinctivering = 0;
-@@ -2599,7 +2786,7 @@ static int zt_hangup(struct ast_channel
+@@ -2593,7 +2780,7 @@ static int zt_hangup(struct ast_channel
pri_call_set_useruser(p->call, useruser);
#endif
@@ -496,7 +496,7 @@
p->call = NULL;
if (p->bearer)
p->bearer->call = NULL;
-@@ -2619,7 +2806,28 @@ static int zt_hangup(struct ast_channel
+@@ -2613,7 +2800,28 @@ static int zt_hangup(struct ast_channel
if (atoi(cause))
icause = atoi(cause);
}
@@ -526,7 +526,7 @@
}
if (res < 0)
ast_log(LOG_WARNING, "pri_disconnect failed\n");
-@@ -2803,10 +3011,14 @@ static int zt_answer(struct ast_channel
+@@ -2797,10 +3005,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);
@@ -541,7 +541,7 @@
break;
#endif
case 0:
-@@ -3432,6 +3644,15 @@ static int zt_fixup(struct ast_channel *
+@@ -3428,6 +3640,15 @@ static int zt_fixup(struct ast_channel *
{
struct zt_pvt *p = newchan->tech_pvt;
int x;
@@ -557,7 +557,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) {
-@@ -3641,8 +3862,10 @@ static void zt_handle_dtmfup(struct ast_
+@@ -3637,8 +3858,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);
@@ -569,7 +569,7 @@
} else if (option_debug)
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
} else if (option_debug)
-@@ -3796,7 +4019,7 @@ static struct ast_frame *zt_handle_event
+@@ -3792,7 +4015,7 @@ static struct ast_frame *zt_handle_event
if (p->call) {
if (p->pri && p->pri->pri) {
if (!pri_grab(p, p->pri)) {
@@ -578,7 +578,7 @@
pri_destroycall(p->pri->pri, p->call);
p->call = NULL;
pri_rel(p->pri);
-@@ -4855,7 +5078,7 @@ static struct ast_frame *zt_read(struct
+@@ -4851,7 +5074,7 @@ static struct ast_frame *zt_read(struct
p->subs[index].f.data = NULL;
p->subs[index].f.datalen= 0;
}
@@ -587,7 +587,7 @@
/* Perform busy detection. etc on the zap line */
f = ast_dsp_process(ast, p->dsp, &p->subs[index].f);
if (f) {
-@@ -4867,8 +5090,9 @@ static struct ast_frame *zt_read(struct
+@@ -4863,8 +5086,9 @@ static struct ast_frame *zt_read(struct
}
} else if (f->frametype == AST_FRAME_DTMF) {
#ifdef HAVE_PRI
@@ -599,7 +599,7 @@
f->frametype = AST_FRAME_NULL;
f->subclass = 0;
}
-@@ -4944,7 +5168,9 @@ static int zt_write(struct ast_channel *
+@@ -4940,7 +5164,9 @@ static int zt_write(struct ast_channel *
#endif
/* Write a frame of (presumably voice) data */
if (frame->frametype != AST_FRAME_VOICE) {
@@ -610,7 +610,7 @@
ast_log(LOG_WARNING, "Don't know what to do with frame type '%d'\n", frame->frametype);
return 0;
}
-@@ -5016,7 +5242,7 @@ static int zt_indicate(struct ast_channe
+@@ -5012,7 +5238,7 @@ static int zt_indicate(struct ast_channe
switch (condition) {
case AST_CONTROL_BUSY:
#ifdef HAVE_PRI
@@ -619,7 +619,7 @@
chan->hangupcause = AST_CAUSE_USER_BUSY;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5098,7 +5324,7 @@ static int zt_indicate(struct ast_channe
+@@ -5094,7 +5320,7 @@ static int zt_indicate(struct ast_channe
case AST_CONTROL_CONGESTION:
chan->hangupcause = AST_CAUSE_CONGESTION;
#ifdef HAVE_PRI
@@ -628,7 +628,7 @@
chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
-@@ -5292,8 +5518,12 @@ static struct ast_channel *zt_new(struct
+@@ -5288,8 +5514,12 @@ static struct ast_channel *zt_new(struct
if (state == AST_STATE_RING)
tmp->rings = 1;
tmp->tech_pvt = i;
@@ -642,7 +642,7 @@
tmp->callgroup = i->callgroup;
tmp->pickupgroup = i->pickupgroup;
}
-@@ -5427,6 +5657,7 @@ static void *ss_thread(void *data)
+@@ -5423,6 +5653,7 @@ static void *ss_thread(void *data)
int len = 0;
int res;
int index;
@@ -650,7 +650,7 @@
/* in the bizarre case where the channel has become a zombie before we
even get started here, abort safely
-@@ -5455,10 +5686,17 @@ static void *ss_thread(void *data)
+@@ -5451,10 +5682,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)) {
@@ -671,7 +671,7 @@
if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num))
timeout = matchdigittimeout;
else
-@@ -6664,18 +6902,44 @@ static int handle_init_event(struct zt_p
+@@ -6660,18 +6898,44 @@ static int handle_init_event(struct zt_p
break;
case ZT_EVENT_NOALARM:
i->inalarm = 0;
@@ -716,7 +716,7 @@
/* fall thru intentionally */
case ZT_EVENT_ONHOOK:
if (i->radio)
-@@ -6719,8 +6983,10 @@ static int handle_init_event(struct zt_p
+@@ -6715,8 +6979,10 @@ static int handle_init_event(struct zt_p
zt_set_hook(i->subs[SUB_REAL].zfd, ZT_ONHOOK);
break;
case SIG_PRI:
@@ -729,7 +729,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);
-@@ -7010,6 +7276,8 @@ static int pri_resolve_span(int *span, i
+@@ -7006,6 +7272,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;
@@ -738,7 +738,7 @@
} else {
pris[*span].dchannels[0] = 24 + offset;
}
-@@ -7262,6 +7530,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7258,6 +7526,11 @@ static struct zt_pvt *mkintf(int channel
destroy_zt_pvt(&tmp);
return NULL;
}
@@ -750,7 +750,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);
-@@ -7279,6 +7552,11 @@ static struct zt_pvt *mkintf(int channel
+@@ -7275,6 +7548,11 @@ static struct zt_pvt *mkintf(int channel
return NULL;
}
pris[span].nodetype = conf.pri.nodetype;
@@ -762,7 +762,7 @@
pris[span].switchtype = myswitchtype;
pris[span].nsf = conf.pri.nsf;
pris[span].dialplan = conf.pri.dialplan;
-@@ -7287,9 +7565,14 @@ static struct zt_pvt *mkintf(int channel
+@@ -7283,9 +7561,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;
@@ -777,7 +777,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));
-@@ -7425,6 +7708,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7421,6 +7704,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;
@@ -785,7 +785,7 @@
tmp->priexclusive = conf.chan.priexclusive;
if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) {
-@@ -7704,7 +7988,7 @@ static int pri_find_empty_chan(struct zt
+@@ -7700,7 +7984,7 @@ static int pri_find_empty_chan(struct zt
break;
if (!backwards && (x >= pri->numchans))
break;
@@ -794,7 +794,7 @@
ast_log(LOG_DEBUG, "Found empty available channel %d/%d\n",
pri->pvts[x]->logicalspan, pri->pvts[x]->prioffset);
return x;
-@@ -7900,6 +8184,11 @@ static struct ast_channel *zt_request(co
+@@ -7896,6 +8180,11 @@ static struct ast_channel *zt_request(co
p->digital = 1;
if (tmp)
tmp->transfercapability = AST_TRANS_CAP_DIGITAL;
@@ -806,7 +806,7 @@
} else {
ast_log(LOG_WARNING, "Unknown option '%c' in '%s'\n", opt, (char *)data);
}
-@@ -7933,13 +8222,14 @@ next:
+@@ -7929,13 +8218,14 @@ next:
*cause = AST_CAUSE_BUSY;
} else if (groupmatched) {
*cause = AST_CAUSE_CONGESTION;
@@ -822,7 +822,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -7953,6 +8243,58 @@ static struct zt_pvt *pri_find_crv(struc
+@@ -7949,6 +8239,58 @@ static struct zt_pvt *pri_find_crv(struc
return NULL;
}
@@ -881,7 +881,7 @@
static int pri_find_principle(struct zt_pri *pri, int channel)
{
-@@ -7984,7 +8326,9 @@ static int pri_find_principle(struct zt_
+@@ -7980,7 +8322,9 @@ static int pri_find_principle(struct zt_
static int pri_fixup_principle(struct zt_pri *pri, int principle, q931_call *c)
{
int x;
@@ -891,7 +891,7 @@
if (!c) {
if (principle < 0)
return -1;
-@@ -8012,6 +8356,7 @@ static int pri_fixup_principle(struct zt
+@@ -8008,6 +8352,7 @@ static int pri_fixup_principle(struct zt
}
/* Fix it all up now */
pri->pvts[principle]->owner = pri->pvts[x]->owner;
@@ -899,7 +899,7 @@
if (pri->pvts[principle]->owner) {
ast_string_field_build(pri->pvts[principle]->owner, name,
"Zap/%d:%d-%d", pri->trunkgroup,
-@@ -8019,13 +8364,48 @@ static int pri_fixup_principle(struct zt
+@@ -8015,13 +8360,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;
@@ -949,7 +949,7 @@
}
return principle;
}
-@@ -8054,7 +8434,9 @@ static int pri_fixup_principle(struct zt
+@@ -8050,7 +8430,9 @@ static int pri_fixup_principle(struct zt
}
crv = crv->next;
}
@@ -960,7 +960,7 @@
return -1;
}
-@@ -8113,86 +8495,21 @@ static void *do_idle_thread(void *vchan)
+@@ -8109,86 +8491,21 @@ static void *do_idle_thread(void *vchan)
#ifndef PRI_RESTART
#error "Upgrade your libpri"
#endif
@@ -1054,7 +1054,7 @@
do {
pri->resetpos++;
} while ((pri->resetpos < pri->numchans) &&
-@@ -8276,13 +8593,30 @@ static void apply_plan_to_number(char *b
+@@ -8272,13 +8589,30 @@ static void apply_plan_to_number(char *b
}
}
@@ -1092,7 +1092,7 @@
}
static void *pri_dchannel(void *vpri)
-@@ -8462,15 +8796,44 @@ static void *pri_dchannel(void *vpri)
+@@ -8458,15 +8792,44 @@ static void *pri_dchannel(void *vpri)
/* Check for an event */
x = 0;
res = ioctl(pri->fds[which], ZT_GETEVENT, &x);
@@ -1140,7 +1140,7 @@
}
if (option_debug)
-@@ -8482,8 +8845,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8478,8 +8841,7 @@ static void *pri_dchannel(void *vpri)
break;
}
} else if (errno != EINTR)
@@ -1150,7 +1150,7 @@
if (e) {
if (pri->debug)
pri_dump_event(pri->dchans[which], e);
-@@ -8496,32 +8858,86 @@ static void *pri_dchannel(void *vpri)
+@@ -8492,32 +8854,86 @@ static void *pri_dchannel(void *vpri)
switch (e->e) {
case PRI_EVENT_DCHAN_UP:
@@ -1254,7 +1254,7 @@
pri->resetting = 0;
/* Hangup active channels and put them in alarm mode */
for (i = 0; i < pri->numchans; i++) {
-@@ -8531,12 +8947,13 @@ static void *pri_dchannel(void *vpri)
+@@ -8527,12 +8943,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) {
@@ -1269,7 +1269,7 @@
if (p->realcall) {
pri_hangup_all(p->realcall, pri);
} else if (p->owner)
-@@ -8545,6 +8962,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8541,6 +8958,7 @@ static void *pri_dchannel(void *vpri)
p->inalarm = 1;
}
}
@@ -1277,7 +1277,7 @@
}
break;
case PRI_EVENT_RESTART:
-@@ -8579,8 +8997,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8575,8 +8993,8 @@ static void *pri_dchannel(void *vpri)
pri_destroycall(pri->pri, pri->pvts[x]->call);
pri->pvts[x]->call = NULL;
}
@@ -1288,7 +1288,7 @@
else if (pri->pvts[x]->owner)
pri->pvts[x]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_mutex_unlock(&pri->pvts[x]->lock);
-@@ -8614,7 +9032,6 @@ static void *pri_dchannel(void *vpri)
+@@ -8610,7 +9028,6 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -1296,7 +1296,7 @@
case PRI_EVENT_INFO_RECEIVED:
chanpos = pri_find_principle(pri, e->ring.channel);
if (chanpos < 0) {
-@@ -8623,9 +9040,11 @@ static void *pri_dchannel(void *vpri)
+@@ -8619,9 +9036,11 @@ static void *pri_dchannel(void *vpri)
} else {
chanpos = pri_fixup_principle(pri, chanpos, e->ring.call);
if (chanpos > -1) {
@@ -1309,7 +1309,7 @@
/* how to do that */
int digitlen = strlen(e->ring.callednum);
char digit;
-@@ -8637,6 +9056,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8633,6 +9052,14 @@ static void *pri_dchannel(void *vpri)
zap_queue_frame(pri->pvts[chanpos], &f, pri);
}
}
@@ -1324,7 +1324,7 @@
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
-@@ -8644,36 +9071,59 @@ static void *pri_dchannel(void *vpri)
+@@ -8640,36 +9067,59 @@ static void *pri_dchannel(void *vpri)
break;
case PRI_EVENT_RING:
crv = NULL;
@@ -1400,7 +1400,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));
-@@ -8687,13 +9137,14 @@ static void *pri_dchannel(void *vpri)
+@@ -8683,13 +9133,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);
@@ -1416,7 +1416,7 @@
pri->pvts[chanpos]->call = e->ring.call;
apply_plan_to_number(plancallingnum, sizeof(plancallingnum), pri, e->ring.callingnum, e->ring.callingplan);
if (pri->pvts[chanpos]->use_callerid) {
-@@ -8718,29 +9169,78 @@ static void *pri_dchannel(void *vpri)
+@@ -8714,29 +9165,78 @@ static void *pri_dchannel(void *vpri)
}
apply_plan_to_number(pri->pvts[chanpos]->rdnis, sizeof(pri->pvts[chanpos]->rdnis), pri,
e->ring.redirectingnum, e->ring.callingplanrdnis);
@@ -1508,7 +1508,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)) {
-@@ -8759,19 +9259,36 @@ static void *pri_dchannel(void *vpri)
+@@ -8755,19 +9255,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);
@@ -1548,7 +1548,7 @@
/* Get the use_callingpres state */
pri->pvts[chanpos]->callingpres = e->ring.callingpres;
-@@ -8783,14 +9300,31 @@ static void *pri_dchannel(void *vpri)
+@@ -8779,14 +9296,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);
@@ -1580,7 +1580,7 @@
if (e->ring.ani2 >= 0) {
snprintf(ani2str, 5, "%.2d", e->ring.ani2);
pbx_builtin_setvar_helper(c, "ANI2", ani2str);
-@@ -8812,8 +9346,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8808,8 +9342,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)
@@ -1591,7 +1591,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",
-@@ -8821,15 +9355,19 @@ static void *pri_dchannel(void *vpri)
+@@ -8817,15 +9351,19 @@ static void *pri_dchannel(void *vpri)
if (c)
ast_hangup(c);
else {
@@ -1612,7 +1612,7 @@
ast_mutex_lock(&pri->lock);
if (c) {
char calledtonstr[10];
-@@ -8850,23 +9388,40 @@ static void *pri_dchannel(void *vpri)
+@@ -8846,23 +9384,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)
@@ -1657,7 +1657,7 @@
pri->pvts[chanpos]->call = NULL;
pri->pvts[chanpos]->exten[0] = '\0';
}
-@@ -8875,9 +9430,9 @@ static void *pri_dchannel(void *vpri)
+@@ -8871,9 +9426,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
if (e->ring.flexible)
@@ -1669,7 +1669,7 @@
}
break;
case PRI_EVENT_RINGING:
-@@ -8893,7 +9448,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8889,7 +9444,7 @@ static void *pri_dchannel(void *vpri)
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
if (ast_strlen_zero(pri->pvts[chanpos]->dop.dialstr)) {
@@ -1678,7 +1678,7 @@
pri->pvts[chanpos]->subs[SUB_REAL].needringing = 1;
pri->pvts[chanpos]->alerting = 1;
} else
-@@ -8922,9 +9477,16 @@ static void *pri_dchannel(void *vpri)
+@@ -8918,9 +9473,16 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_PROGRESS:
@@ -1696,7 +1696,7 @@
#ifdef PRI_PROGRESS_MASK
if ((!pri->pvts[chanpos]->progress) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
#else
-@@ -8971,6 +9533,12 @@ static void *pri_dchannel(void *vpri)
+@@ -8967,6 +9529,12 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_PROCEEDING:
chanpos = pri_find_principle(pri, e->proceeding.channel);
if (chanpos > -1) {
@@ -1709,7 +1709,7 @@
if (!pri->pvts[chanpos]->proceeding) {
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
-@@ -9018,6 +9586,295 @@ static void *pri_dchannel(void *vpri)
+@@ -9014,6 +9582,295 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -2005,7 +2005,7 @@
case PRI_EVENT_ANSWER:
chanpos = pri_find_principle(pri, e->answer.channel);
if (chanpos < 0) {
-@@ -9030,6 +9887,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9026,6 +9883,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);
@@ -2013,7 +2013,7 @@
/* Now we can do call progress detection */
/* We changed this so it turns on the DSP no matter what... progress or no progress.
-@@ -9059,11 +9917,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9055,11 +9913,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) {
@@ -2031,7 +2031,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9117,20 +9980,29 @@ static void *pri_dchannel(void *vpri)
+@@ -9113,20 +9976,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 {
@@ -2068,7 +2068,7 @@
#ifdef SUPPORT_USERUSER
if (!ast_strlen_zero(e->hangup.useruserinfo)) {
-@@ -9140,8 +10012,20 @@ static void *pri_dchannel(void *vpri)
+@@ -9136,8 +10008,20 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -2091,7 +2091,7 @@
}
}
break;
-@@ -9151,15 +10035,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9147,15 +10031,23 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_HANGUP_REQ:
chanpos = pri_find_principle(pri, e->hangup.channel);
if (chanpos < 0) {
@@ -2118,7 +2118,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;
-@@ -9186,16 +10078,86 @@ static void *pri_dchannel(void *vpri)
+@@ -9182,16 +10074,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");
@@ -2209,7 +2209,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9206,9 +10168,39 @@ static void *pri_dchannel(void *vpri)
+@@ -9202,9 +10164,39 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -2250,7 +2250,7 @@
break;
case PRI_EVENT_HANGUP_ACK:
chanpos = pri_find_principle(pri, e->hangup.channel);
-@@ -9220,6 +10212,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9216,6 +10208,7 @@ static void *pri_dchannel(void *vpri)
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
pri->pvts[chanpos]->call = NULL;
@@ -2258,7 +2258,7 @@
pri->pvts[chanpos]->resetting = 0;
if (pri->pvts[chanpos]->owner) {
if (option_verbose > 2)
-@@ -9233,7 +10226,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9229,7 +10222,9 @@ static void *pri_dchannel(void *vpri)
#endif
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@@ -2268,7 +2268,7 @@
}
break;
case PRI_EVENT_CONFIG_ERR:
-@@ -9323,10 +10318,22 @@ static void *pri_dchannel(void *vpri)
+@@ -9319,10 +10314,22 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->pvts[chanpos]->lock);
switch (e->notify.info) {
case PRI_NOTIFY_REMOTE_HOLD:
@@ -2291,7 +2291,7 @@
f.subclass = AST_CONTROL_UNHOLD;
zap_queue_frame(pri->pvts[chanpos], &f, pri);
break;
-@@ -9334,6 +10341,77 @@ static void *pri_dchannel(void *vpri)
+@@ -9330,6 +10337,77 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
break;
@@ -2369,7 +2369,7 @@
default:
ast_log(LOG_DEBUG, "Event: %d\n", e->e);
}
-@@ -9395,7 +10473,7 @@ static int start_pri(struct zt_pri *pri)
+@@ -9391,7 +10469,7 @@ static int start_pri(struct zt_pri *pri)
pri->fds[i] = -1;
return -1;
}
@@ -2378,7 +2378,7 @@
/* Force overlap dial if we're doing GR-303! */
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial = 1;
-@@ -9463,39 +10541,77 @@ static char *complete_span_5(const char
+@@ -9459,39 +10537,77 @@ static char *complete_span_5(const char
static int handle_pri_set_debug_file(int fd, int argc, char **argv)
{
@@ -2478,7 +2478,7 @@
}
return RESULT_SUCCESS;
-@@ -9529,6 +10645,7 @@ static int handle_pri_debug(int fd, int
+@@ -9525,6 +10641,7 @@ static int handle_pri_debug(int fd, int
@@ -2486,7 +2486,7 @@
static int handle_pri_no_debug(int fd, int argc, char *argv[])
{
int span;
-@@ -9678,10 +10795,6 @@ static int handle_pri_show_debug(int fd,
+@@ -9674,10 +10791,6 @@ static int handle_pri_show_debug(int fd,
}
}
@@ -2497,7 +2497,7 @@
if (!count)
ast_cli(fd, "No debug set or no PRI running\n");
-@@ -9708,6 +10821,18 @@ static const char pri_show_spans_help[]
+@@ -9704,6 +10817,18 @@ static const char pri_show_spans_help[]
"Usage: pri show spans\n"
" Displays PRI Information\n";
@@ -2516,7 +2516,7 @@
static struct ast_cli_entry zap_pri_cli[] = {
{ { "pri", "debug", "span", NULL },
handle_pri_debug, "Enables PRI debugging on a span",
-@@ -9732,6 +10857,15 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9728,6 +10853,15 @@ static struct ast_cli_entry zap_pri_cli[
{ { "pri", "show", "debug", NULL },
handle_pri_show_debug, "Displays current PRI debug settings" },
@@ -2532,7 +2532,7 @@
{ { "pri", "set", "debug", "file", NULL },
handle_pri_set_debug_file, "Sends PRI debug output to the specified file" },
-@@ -9739,8 +10873,76 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9735,8 +10869,76 @@ static struct ast_cli_entry zap_pri_cli[
handle_pri_set_debug_file, "Ends PRI debug output to file" },
};
@@ -2609,7 +2609,7 @@
static int zap_destroy_channel(int fd, int argc, char **argv)
{
int channel;
-@@ -10320,8 +11522,11 @@ static int __unload_module(void)
+@@ -10316,8 +11518,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);
@@ -2621,7 +2621,7 @@
ast_manager_unregister( "ZapDialOffhook" );
ast_manager_unregister( "ZapHangup" );
ast_manager_unregister( "ZapTransfer" );
-@@ -10823,6 +12028,22 @@ static int process_zap(struct zt_chan_co
+@@ -10819,6 +12024,22 @@ static int process_zap(struct zt_chan_co
confp->chan.sig = SIG_GR303FXSKS;
confp->chan.radio = 0;
confp->pri.nodetype = PRI_CPE;
@@ -2644,7 +2644,7 @@
#endif
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
-@@ -10935,9 +12156,21 @@ static int process_zap(struct zt_chan_co
+@@ -10931,9 +12152,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;
@@ -2667,7 +2667,7 @@
} else if (!strcasecmp(v->name, "priexclusive")) {
confp->chan.priexclusive = ast_true(v->value);
} else if (!strcasecmp(v->name, "internationalprefix")) {
-@@ -10950,6 +12183,10 @@ static int process_zap(struct zt_chan_co
+@@ -10946,6 +12179,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));
@@ -2678,7 +2678,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -10966,6 +12203,8 @@ static int process_zap(struct zt_chan_co
+@@ -10962,6 +12199,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));
@@ -2687,7 +2687,7 @@
} else if (!strcasecmp(v->name, "overlapdial")) {
confp->pri.overlapdial = ast_true(v->value);
} else if (!strcasecmp(v->name, "pritimer")) {
-@@ -11267,6 +12506,7 @@ static int setup_zap(int reload)
+@@ -11263,6 +12502,7 @@ static int setup_zap(int reload)
#ifdef HAVE_PRI
if (!reload) {
for (x = 0; x < NUM_SPANS; x++) {
@@ -2695,7 +2695,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);
-@@ -11314,7 +12554,10 @@ static int load_module(void)
+@@ -11310,7 +12550,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));
@@ -2706,7 +2706,7 @@
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
memset(round_robin, 0, sizeof(round_robin));
-@@ -11348,6 +12591,7 @@ static int zt_sendtext(struct ast_channe
+@@ -11344,6 +12587,7 @@ static int zt_sendtext(struct ast_channe
float scont = 0.0;
int index;
@@ -2714,8 +2714,8 @@
index = zt_get_index(c, p, 0);
if (index < 0) {
ast_log(LOG_WARNING, "Huh? I don't exist?\n");
---- asterisk-1.4.8~dfsg.orig/configs/zapata.conf.sample
-+++ asterisk-1.4.8~dfsg/configs/zapata.conf.sample
+--- asterisk-1.4.10.1~dfsg.orig/configs/zapata.conf.sample
++++ asterisk-1.4.10.1~dfsg/configs/zapata.conf.sample
@@ -123,9 +123,20 @@ switchtype=national
;
; outofband: Signal Busy/Congestion out of band with RELEASE/DISCONNECT
@@ -2737,9 +2737,9 @@
; If you need to override the existing channels selection routine and force all
; PRI channels to be marked as exclusively selected, set this to yes.
; priexclusive = yes
---- asterisk-1.4.8~dfsg.orig/main/channel.c
-+++ asterisk-1.4.8~dfsg/main/channel.c
-@@ -4091,6 +4091,10 @@ enum ast_bridge_result ast_channel_bridg
+--- asterisk-1.4.10.1~dfsg.orig/main/channel.c
++++ asterisk-1.4.10.1~dfsg/main/channel.c
+@@ -4112,6 +4112,10 @@ enum ast_bridge_result ast_channel_bridg
c1->name, c1->_bridge->name);
return -1;
}
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
===================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/channels/chan_zap.c
-+++ asterisk-1.4.8~dfsg/channels/chan_zap.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_zap.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_zap.c
@@ -76,6 +76,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifdef HAVE_PRI
#include <libpri.h>
@@ -92,7 +92,7 @@
case 0:
return "Pseudo Signalling";
default:
-@@ -1791,7 +1816,7 @@ static inline int zt_confmute(struct zt_
+@@ -1785,7 +1810,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)
-@@ -2206,6 +2231,25 @@ static int zt_call(struct ast_channel *a
+@@ -2200,6 +2225,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
+@@ -2838,7 +2882,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
+@@ -3015,6 +3065,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;
-@@ -7365,6 +7422,10 @@ static int pri_create_spanmap(int span,
+@@ -7361,6 +7418,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) */
-@@ -7593,6 +7654,37 @@ static struct zt_pvt *mkintf(int channel
+@@ -7589,6 +7650,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;
-@@ -7876,6 +7968,12 @@ static inline int available(struct zt_pv
+@@ -7872,6 +7964,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))
-@@ -8230,6 +8328,235 @@ next:
+@@ -8226,6 +8324,235 @@ next:
return tmp;
}
@@ -454,7 +454,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8505,6 +8832,18 @@ static void zt_pri_error(char *s, int sp
+@@ -8501,6 +8828,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)) {
-@@ -10905,6 +11244,243 @@ static int app_zapInband(struct ast_chan
+@@ -10901,6 +11240,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;
-@@ -11525,6 +12101,12 @@ static int __unload_module(void)
+@@ -11521,6 +12097,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" );
-@@ -12045,6 +12627,11 @@ static int process_zap(struct zt_chan_co
+@@ -12041,6 +12623,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);
}
-@@ -12187,6 +12774,10 @@ static int process_zap(struct zt_chan_co
+@@ -12183,6 +12770,10 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.nocid, v->value, sizeof(confp->pri.nocid) - 1);
} else if (!strcasecmp(v->name, "withheldcid")) {
ast_copy_string(confp->pri.withheldcid, v->value, sizeof(confp->pri.withheldcid) - 1);
@@ -753,7 +753,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -12541,6 +13132,10 @@ static int load_module(void)
+@@ -12537,6 +13128,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)
-@@ -12559,6 +13154,12 @@ static int load_module(void)
+@@ -12555,6 +13150,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" );
-@@ -12572,7 +13173,48 @@ static int load_module(void)
+@@ -12568,7 +13169,48 @@ static int load_module(void)
return res;
}
@@ -827,8 +827,8 @@
{
#define END_SILENCE_LEN 400
#define HEADER_MS 50
---- asterisk-1.4.8~dfsg.orig/configure.ac
-+++ asterisk-1.4.8~dfsg/configure.ac
+--- asterisk-1.4.10.1~dfsg.orig/configure.ac
++++ asterisk-1.4.10.1~dfsg/configure.ac
@@ -175,6 +175,7 @@ AST_EXT_LIB_SETUP([CURL], [cURL], [curl]
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
@@ -837,9 +837,9 @@
AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
---- asterisk-1.4.8~dfsg.orig/configure
-+++ asterisk-1.4.8~dfsg/configure
-@@ -24642,6 +24642,188 @@ echo "$as_me: *** without explicitly spe
+--- asterisk-1.4.10.1~dfsg.orig/configure
++++ asterisk-1.4.10.1~dfsg/configure
+@@ -24745,6 +24745,188 @@ echo "$as_me: *** without explicitly spe
fi
fi
Modified: asterisk/trunk/debian/patches/make-clean-fixes
===================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/make-clean-fixes 2007-08-20 04:01:58 UTC (rev 4160)
@@ -5,9 +5,9 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.9~dfsg.orig/Makefile
-+++ asterisk-1.4.9~dfsg/Makefile
-@@ -360,7 +360,6 @@ dist-clean: distclean
+--- asterisk-1.4.10.1~dfsg.orig/Makefile
++++ asterisk-1.4.10.1~dfsg/Makefile
+@@ -364,7 +364,6 @@ dist-clean: distclean
distclean: clean
@$(MAKE) -C menuselect dist-clean
@@ -15,7 +15,7 @@
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status
-@@ -370,6 +369,10 @@ distclean: clean
+@@ -374,6 +373,10 @@ distclean: clean
rm -rf doc/api
rm -f build_tools/menuselect-deps
@@ -26,8 +26,8 @@
datafiles: _all
if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
---- asterisk-1.4.9~dfsg.orig/channels/Makefile
-+++ asterisk-1.4.9~dfsg/channels/Makefile
+--- asterisk-1.4.10.1~dfsg.orig/channels/Makefile
++++ asterisk-1.4.10.1~dfsg/channels/Makefile
@@ -68,6 +68,7 @@ ifneq ($(wildcard h323/Makefile.ast),)
H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
clean::
@@ -36,8 +36,8 @@
else
h323/libchanh323.a h323/Makefile.ast:
$(CMD_PREFIX) $(MAKE) -C h323
---- asterisk-1.4.9~dfsg.orig/codecs/Makefile
-+++ asterisk-1.4.9~dfsg/codecs/Makefile
+--- asterisk-1.4.10.1~dfsg.orig/codecs/Makefile
++++ asterisk-1.4.10.1~dfsg/codecs/Makefile
@@ -38,7 +38,7 @@ endif
clean::
$(MAKE) -C gsm clean
@@ -47,8 +47,8 @@
gsm/lib/libgsm.a:
@mkdir -p gsm/lib
---- asterisk-1.4.9~dfsg.orig/menuselect/Makefile
-+++ asterisk-1.4.9~dfsg/menuselect/Makefile
+--- asterisk-1.4.10.1~dfsg.orig/menuselect/Makefile
++++ asterisk-1.4.10.1~dfsg/menuselect/Makefile
@@ -79,6 +79,6 @@ clean:
dist-clean: distclean
@@ -57,8 +57,8 @@
+ @if test -f mxml/Makefile ; then $(MAKE) -C mxml distclean ; fi
rm -f autoconfig.h config.status config.log makeopts
rm -rf autom4te.cache
---- asterisk-1.4.9~dfsg.orig/menuselect/mxml/Makefile.in
-+++ asterisk-1.4.9~dfsg/menuselect/mxml/Makefile.in
+--- asterisk-1.4.10.1~dfsg.orig/menuselect/mxml/Makefile.in
++++ asterisk-1.4.10.1~dfsg/menuselect/mxml/Makefile.in
@@ -119,6 +119,8 @@ clean:
$(RM) config.cache config.log config.status config.h
$(RM) -r autom4te*.cache
Modified: asterisk/trunk/debian/patches/use-libpri-bristuffed
===================================================================
--- asterisk/trunk/debian/patches/use-libpri-bristuffed 2007-08-20 03:48:43 UTC (rev 4159)
+++ asterisk/trunk/debian/patches/use-libpri-bristuffed 2007-08-20 04:01:58 UTC (rev 4160)
@@ -1,6 +1,6 @@
---- asterisk-1.4.9~dfsg.orig/configure
-+++ asterisk-1.4.9~dfsg/configure
-@@ -24323,18 +24323,18 @@ fi
+--- asterisk-1.4.10.1~dfsg.orig/configure
++++ asterisk-1.4.10.1~dfsg/configure
+@@ -24426,18 +24426,18 @@ fi
if test "${AST_PRI_FOUND}" = "yes"; then
@@ -25,7 +25,7 @@
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-@@ -24343,8 +24343,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
+@@ -24446,8 +24446,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
@@ -36,7 +36,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24352,7 +24352,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -24455,7 +24455,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -45,7 +45,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -24384,15 +24384,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -24487,15 +24487,15 @@ rm -f core conftest.err conftest.$ac_obj
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
@@ -64,7 +64,7 @@
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -24425,30 +24425,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
+@@ -24528,30 +24528,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
@@ -113,9 +113,9 @@
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
---- asterisk-1.4.9~dfsg.orig/configure.ac
-+++ asterisk-1.4.9~dfsg/configure.ac
-@@ -795,7 +795,7 @@ fi
+--- asterisk-1.4.10.1~dfsg.orig/configure.ac
++++ asterisk-1.4.10.1~dfsg/configure.ac
+@@ -815,7 +815,7 @@ fi
AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
@@ -124,8 +124,8 @@
if test "${USE_PWLIB}" != "no"; then
if test -n "${PWLIB_DIR}"; then
---- asterisk-1.4.9~dfsg.orig/channels/chan_zap.c
-+++ asterisk-1.4.9~dfsg/channels/chan_zap.c
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_zap.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_zap.c
@@ -74,7 +74,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <zaptel/tonezone.h>
More information about the Pkg-voip-commits
mailing list