[Pkg-voip-commits] r5151 - in /asterisk/trunk/debian/patches/bristuff: answer-before-say ast-device-state-CID ast-send-message ast-send-message-users ast_monitor_start-targetscript feature-autoanswer feature-holdedcalls uniqueid-10-channel-ops-uniqueid zapata-bri+euroisdn
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Wed Jan 2 23:07:36 UTC 2008
Author: paravoid
Date: Wed Jan 2 23:07:36 2008
New Revision: 5151
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5151
Log:
Do an quilt refresh on all patches
Modified:
asterisk/trunk/debian/patches/bristuff/answer-before-say
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/feature-autoanswer
asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
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=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/trunk/debian/patches/bristuff/answer-before-say Wed Jan 2 23:07:36 2008
@@ -3,7 +3,7 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -6054,6 +6054,9 @@ static int pbx_builtin_saynumber(struct
+@@ -6060,6 +6060,9 @@ static int pbx_builtin_saynumber(struct
return -1;
}
}
@@ -13,7 +13,7 @@
return ast_say_number(chan, atoi(tmp), "", chan->language, options);
}
-@@ -6061,8 +6064,12 @@ static int pbx_builtin_saydigits(struct
+@@ -6067,8 +6070,12 @@ static int pbx_builtin_saydigits(struct
{
int res = 0;
@@ -27,7 +27,7 @@
return res;
}
-@@ -6070,8 +6077,12 @@ static int pbx_builtin_saycharacters(str
+@@ -6076,8 +6083,12 @@ static int pbx_builtin_saycharacters(str
{
int res = 0;
@@ -41,7 +41,7 @@
return res;
}
-@@ -6079,8 +6090,12 @@ static int pbx_builtin_sayphonetic(struc
+@@ -6085,8 +6096,12 @@ static int pbx_builtin_sayphonetic(struc
{
int res = 0;
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=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Wed Jan 2 23:07:36 2008
@@ -130,7 +130,7 @@
\return Returns NULL on failure to allocate.
--- a/main/channel.c
+++ b/main/channel.c
-@@ -1274,7 +1274,7 @@ void ast_channel_free(struct ast_channel
+@@ -1277,7 +1277,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)
-@@ -3938,7 +3938,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3941,7 +3941,7 @@ void ast_set_callerid(struct ast_channel
ast_channel_unlock(chan);
}
@@ -148,7 +148,7 @@
{
int oldstate = chan->_state;
-@@ -3946,7 +3946,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3949,7 +3949,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",
-@@ -3963,6 +3963,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3966,6 +3966,11 @@ int ast_setstate(struct ast_channel *cha
return 0;
}
@@ -180,7 +180,7 @@
/*! \brief Data structure associated with a custom dialplan function */
struct ast_custom_function {
-@@ -873,7 +873,7 @@ int ast_func_read(struct ast_channel *ch
+@@ -875,7 +875,7 @@ int ast_func_read(struct ast_channel *ch
*/
int ast_func_write(struct ast_channel *chan, char *function, const char *value);
@@ -191,7 +191,7 @@
}
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -2007,7 +2007,7 @@ int ast_extension_state(struct ast_chann
+@@ -2011,7 +2011,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;
-@@ -2039,11 +2039,11 @@ void ast_hint_state_changed(const char *
+@@ -2042,11 +2042,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 */
}
-@@ -2239,7 +2239,7 @@ static int ast_remove_hint(struct ast_ex
+@@ -2241,7 +2241,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;
-@@ -4002,7 +4002,7 @@ void ast_merge_contexts_and_delete(struc
+@@ -4008,7 +4008,7 @@ void ast_merge_contexts_and_delete(struc
while (thiscb) {
prevcb = thiscb;
thiscb = thiscb->next;
@@ -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);
-@@ -8463,7 +8463,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8459,7 +8459,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
-@@ -682,7 +682,7 @@ static void *device_state_thread(void *d
+@@ -690,7 +690,7 @@ static void *device_state_thread(void *d
return NULL;
}
@@ -283,7 +283,7 @@
{ -1, "all" },
{ 0, "none" },
};
-@@ -2524,10 +2525,12 @@ int ast_manager_unregister(char *action)
+@@ -2538,10 +2539,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=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Wed Jan 2 23:07:36 2008
@@ -45,7 +45,7 @@
* \param chan channel to act upon
--- a/main/channel.c
+++ b/main/channel.c
-@@ -2691,7 +2691,7 @@ char *ast_recvtext(struct ast_channel *c
+@@ -2694,7 +2694,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 */
-@@ -2699,7 +2699,7 @@ int ast_sendtext(struct ast_channel *cha
+@@ -2702,7 +2702,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;
}
-@@ -2878,7 +2878,7 @@ int ast_write(struct ast_channel *chan,
+@@ -2881,7 +2881,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 :
-@@ -4902,6 +4902,25 @@ void ast_channel_stop_silence_generator(
+@@ -4908,6 +4908,25 @@ void ast_channel_stop_silence_generator(
}
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=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message-users (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message-users Wed Jan 2 23:07:36 2008
@@ -60,7 +60,7 @@
static char mandescr_setvar[] =
"Description: Set a global or local channel variable.\n"
"Variables: (Names marked with * are required)\n"
-@@ -2821,6 +2867,7 @@ int init_manager(void)
+@@ -2835,6 +2881,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=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript Wed Jan 2 23:07:36 2008
@@ -95,7 +95,7 @@
ast_channel_unlock(c);
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
-@@ -2789,13 +2789,13 @@ static int try_calling(struct queue_ent
+@@ -2804,13 +2804,13 @@ static int try_calling(struct queue_ent
else
which = peer;
if (monitorfilename)
Modified: asterisk/trunk/debian/patches/bristuff/feature-autoanswer
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-autoanswer?rev=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-autoanswer (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-autoanswer Wed Jan 2 23:07:36 2008
@@ -67,7 +67,7 @@
static struct parkeduser *parkinglot;
AST_MUTEX_DEFINE_STATIC(parking_lock); /*!< protects all static variables above */
-@@ -402,11 +437,13 @@ static int park_call_full(struct ast_cha
+@@ -401,11 +436,13 @@ static int park_call_full(struct ast_cha
"From: %s\r\n"
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
@@ -83,7 +83,7 @@
);
if (peer && adsipark && ast_adsi_available(peer)) {
-@@ -1629,11 +1666,13 @@ static void post_manager_event(const cha
+@@ -1628,11 +1665,13 @@ static void post_manager_event(const cha
"Exten: %s\r\n"
"Channel: %s\r\n"
"CallerID: %s\r\n"
@@ -99,7 +99,7 @@
);
}
-@@ -1888,10 +1927,12 @@ static int park_exec(struct ast_channel
+@@ -1887,10 +1926,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);
-@@ -2045,15 +2086,10 @@ static struct ast_cli_entry cli_show_fea
+@@ -2044,15 +2085,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)
-@@ -2077,12 +2113,13 @@ static int manager_parking_status( struc
+@@ -2076,12 +2112,13 @@ static int manager_parking_status( struc
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
@@ -148,7 +148,7 @@
idText);
}
-@@ -2157,6 +2194,427 @@ static int manager_park(struct mansessio
+@@ -2156,6 +2193,427 @@ static int manager_park(struct mansessio
return 0;
}
@@ -576,7 +576,7 @@
int ast_pickup_call(struct ast_channel *chan)
{
-@@ -2420,6 +2878,7 @@ static int load_config(void)
+@@ -2419,6 +2877,7 @@ static int load_config(void)
static int reload(void)
{
@@ -584,7 +584,7 @@
return load_config();
}
-@@ -2443,6 +2902,12 @@ static int load_module(void)
+@@ -2442,6 +2901,12 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -597,7 +597,7 @@
res |= ast_devstate_prov_add("Park", metermaidstate);
return res;
-@@ -2457,6 +2922,8 @@ static int unload_module(void)
+@@ -2456,6 +2921,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=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-holdedcalls (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-holdedcalls Wed Jan 2 23:07:36 2008
@@ -71,7 +71,7 @@
char *ast_parking_ext(void)
{
return parking_ext;
-@@ -2012,6 +2036,282 @@ static int park_exec(struct ast_channel
+@@ -2011,6 +2035,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;
-@@ -2893,6 +3193,7 @@ static int load_module(void)
+@@ -2892,6 +3192,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);
-@@ -2902,6 +3203,7 @@ static int load_module(void)
+@@ -2901,6 +3202,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);
-@@ -2924,6 +3226,7 @@ static int unload_module(void)
+@@ -2923,6 +3225,7 @@ static int unload_module(void)
ast_unregister_application(parkcall);
ast_unregister_application(autoanswer);
ast_unregister_application(autoanswerlogin);
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid?rev=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Wed Jan 2 23:07:36 2008
@@ -44,7 +44,7 @@
* \param c channel to wait for a digit on
--- a/main/channel.c
+++ b/main/channel.c
-@@ -1032,7 +1032,7 @@ void ast_channel_undefer_dtmf(struct ast
+@@ -1035,7 +1035,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;
-@@ -1060,7 +1060,10 @@ static struct ast_channel *channel_find_
+@@ -1063,7 +1063,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 */
-@@ -1115,39 +1118,44 @@ static struct ast_channel *channel_find_
+@@ -1118,39 +1121,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 */
-@@ -1217,8 +1225,10 @@ void ast_channel_free(struct ast_channel
+@@ -1220,8 +1228,10 @@ void ast_channel_free(struct ast_channel
free(chan->tech_pvt);
}
@@ -129,7 +129,7 @@
ast_copy_string(name, chan->name, sizeof(name));
-@@ -3103,7 +3113,7 @@ char *ast_channel_reason2str(int reason)
+@@ -3106,7 +3116,7 @@ char *ast_channel_reason2str(int reason)
}
}
@@ -138,7 +138,7 @@
{
int dummy_outstate;
int cause = 0;
-@@ -3115,7 +3125,7 @@ struct ast_channel *__ast_request_and_di
+@@ -3118,7 +3128,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 */
-@@ -3138,7 +3148,7 @@ struct ast_channel *__ast_request_and_di
+@@ -3141,7 +3151,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,
-@@ -3227,12 +3237,12 @@ struct ast_channel *__ast_request_and_di
+@@ -3230,12 +3240,12 @@ struct ast_channel *__ast_request_and_di
return chan;
}
@@ -172,7 +172,7 @@
{
struct chanlist *chan;
struct ast_channel *c;
-@@ -3282,6 +3292,11 @@ struct ast_channel *ast_request(const ch
+@@ -3285,6 +3295,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.
-@@ -3669,7 +3684,7 @@ int ast_do_masquerade(struct ast_channel
+@@ -3672,7 +3687,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 */
@@ -206,7 +206,7 @@
if(dchan->_state == AST_STATE_UP) {
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
-@@ -715,9 +715,17 @@ int ast_async_goto_by_name(const char *c
+@@ -717,9 +717,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);
/*! Synchronously or asynchronously make an outbound call and send it to a
@@ -226,7 +226,7 @@
*
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -4979,7 +4979,7 @@ static int ast_pbx_outgoing_cdr_failed(v
+@@ -4985,7 +4985,7 @@ static int ast_pbx_outgoing_cdr_failed(v
return 0; /* success */
}
@@ -235,7 +235,7 @@
{
struct ast_channel *chan;
struct async_stat *as;
-@@ -4989,7 +4989,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -4995,7 +4995,7 @@ int ast_pbx_outgoing_exten(const char *t
if (sync) {
LOAD_OH(oh);
@@ -244,7 +244,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5074,7 +5074,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -5080,7 +5080,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)
-@@ -5114,6 +5114,10 @@ outgoing_exten_cleanup:
+@@ -5120,6 +5120,10 @@ outgoing_exten_cleanup:
return res;
}
@@ -264,7 +264,7 @@
struct app_tmp {
char app[256];
char data[256];
-@@ -5138,7 +5142,7 @@ static void *ast_pbx_run_app(void *data)
+@@ -5144,7 +5148,7 @@ static void *ast_pbx_run_app(void *data)
return NULL;
}
@@ -273,7 +273,7 @@
{
struct ast_channel *chan;
struct app_tmp *tmp;
-@@ -5157,10 +5161,10 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5163,10 +5167,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) {
-@@ -5241,7 +5245,7 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5247,7 +5251,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;
-@@ -5281,6 +5285,10 @@ outgoing_app_cleanup:
+@@ -5287,6 +5291,10 @@ outgoing_app_cleanup:
return res;
}
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=5151&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Wed Jan 2 23:07:36 2008
@@ -10,7 +10,7 @@
int nativeformats; /*!< Kinds of data this channel can natively handle */
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -5126,7 +5126,7 @@ struct app_tmp {
+@@ -5132,7 +5132,7 @@ struct app_tmp {
};
/*! \brief run the application and free the descriptor once done */
@@ -2618,7 +2618,7 @@
; priexclusive = yes
--- a/main/channel.c
+++ b/main/channel.c
-@@ -4206,6 +4206,10 @@ enum ast_bridge_result ast_channel_bridg
+@@ -4209,6 +4209,10 @@ enum ast_bridge_result ast_channel_bridg
c1->name, c1->_bridge->name);
return -1;
}
More information about the Pkg-voip-commits
mailing list