[Pkg-voip-commits] r5459 - in /asterisk/trunk/debian/patches/bristuff: ast-device-state-CID ast-send-message zapata-bri+euroisdn zapata_euroisdn_holded
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Apr 3 02:14:55 UTC 2008
Author: paravoid
Date: Thu Apr 3 02:14:55 2008
New Revision: 5459
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5459
Log:
reduce patch offsets by doing a quilt refresh
Modified:
asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
asterisk/trunk/debian/patches/bristuff/ast-send-message
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
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=5459&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Thu Apr 3 02:14:55 2008
@@ -241,7 +241,7 @@
} else {
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1341,7 +1341,7 @@ static void ast_quiet_chan(struct ast_ch
+@@ -1343,7 +1343,7 @@ static void ast_quiet_chan(struct ast_ch
static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target);
/*--- Device monitoring and Device/extension state handling */
@@ -250,7 +250,7 @@
static int sip_devicestate(void *data);
static int sip_poke_noanswer(const void *data);
static int sip_poke_peer(struct sip_peer *peer);
-@@ -8463,7 +8463,7 @@ static void sip_peer_hold(struct sip_pvt
+@@ -8471,7 +8471,7 @@ static void sip_peer_hold(struct sip_pvt
/*! \brief Callback for the devicestate notification (SUBSCRIBE) support subsystem
\note If you add an "hint" priority to the extension in the dial plan,
you will get notifications on device state changes */
@@ -259,7 +259,7 @@
{
struct sip_pvt *p = data;
-@@ -12636,7 +12636,7 @@ static void handle_response(struct sip_p
+@@ -12642,7 +12642,7 @@ static void handle_response(struct sip_p
if (ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE)) {
/* Ready to send the next state we have on queue */
ast_clear_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
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=5459&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Thu Apr 3 02:14:55 2008
@@ -229,7 +229,7 @@
return phone_write_buf(ast->tech_pvt, text, length, length, 0) ==
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1218,7 +1218,7 @@ static struct ast_config *notify_types;
+@@ -1220,7 +1220,7 @@ static struct ast_config *notify_types;
/*--- PBX interface functions */
static struct ast_channel *sip_request_call(const char *type, int format, void *data, int *cause);
static int sip_devicestate(void *data);
@@ -238,7 +238,7 @@
static int sip_call(struct ast_channel *ast, char *dest, int timeout);
static int sip_hangup(struct ast_channel *ast);
static int sip_answer(struct ast_channel *ast);
-@@ -2350,7 +2350,7 @@ static char *get_in_brackets(char *tmp)
+@@ -2352,7 +2352,7 @@ static char *get_in_brackets(char *tmp)
/*! \brief Send SIP MESSAGE text within a call
Called from PBX core sendtext() application */
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=5459&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Apr 3 02:14:55 2008
@@ -1663,7 +1663,7 @@
case PRI_EVENT_ANSWER:
chanpos = pri_find_principle(pri, e->answer.channel);
if (chanpos < 0) {
-@@ -9072,6 +9619,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9072,6 +9621,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);
@@ -1671,7 +1671,7 @@
/* Now we can do call progress detection */
/* We changed this so it turns on the DSP no matter what... progress or no progress.
-@@ -9101,11 +9649,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9101,11 +9651,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) {
@@ -1689,7 +1689,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9162,20 +9715,29 @@ static void *pri_dchannel(void *vpri)
+@@ -9162,20 +9717,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 {
@@ -1726,7 +1726,7 @@
#ifdef SUPPORT_USERUSER
if (pri->pvts[chanpos]->owner && !ast_strlen_zero(e->hangup.useruserinfo)) {
-@@ -9188,8 +9750,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9188,8 +9752,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1738,7 +1738,7 @@
}
}
break;
-@@ -9199,15 +9762,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9199,15 +9764,23 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_HANGUP_REQ:
chanpos = pri_find_principle(pri, e->hangup.channel);
if (chanpos < 0) {
@@ -1765,7 +1765,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;
-@@ -9234,16 +9805,34 @@ static void *pri_dchannel(void *vpri)
+@@ -9234,16 +9807,34 @@ static void *pri_dchannel(void *vpri)
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s");
@@ -1804,7 +1804,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9257,9 +9846,27 @@ static void *pri_dchannel(void *vpri)
+@@ -9257,9 +9848,27 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1833,7 +1833,7 @@
break;
case PRI_EVENT_HANGUP_ACK:
chanpos = pri_find_principle(pri, e->hangup.channel);
-@@ -9271,6 +9878,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9271,6 +9880,7 @@ static void *pri_dchannel(void *vpri)
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
pri->pvts[chanpos]->call = NULL;
Modified: asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded?rev=5459&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded Thu Apr 3 02:14:55 2008
@@ -117,7 +117,7 @@
static int pri_find_principle(struct zt_pri *pri, int channel)
{
-@@ -9582,18 +9649,150 @@ static void *pri_dchannel(void *vpri)
+@@ -9584,18 +9651,150 @@ static void *pri_dchannel(void *vpri)
pri_hold_reject(pri->pri, e->hold_req.call);
break;
}
@@ -274,7 +274,7 @@
case PRI_EVENT_DISPLAY_RECEIVED:
ast_log(LOG_NOTICE, "DISPLAY IE: [ %s ] received\n",e->display.text);
chanpos = pri_find_principle(pri, e->display.channel);
-@@ -9750,9 +9949,20 @@ static void *pri_dchannel(void *vpri)
+@@ -9752,9 +9951,20 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -298,7 +298,7 @@
}
}
break;
-@@ -9815,11 +10025,63 @@ static void *pri_dchannel(void *vpri)
+@@ -9817,11 +10027,63 @@ static void *pri_dchannel(void *vpri)
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s");
}
@@ -367,7 +367,7 @@
} else {
pri_hangup(pri->pri, pri->pvts[chanpos]->call, e->hangup.cause, -1);
pri->pvts[chanpos]->call = NULL;
-@@ -9849,7 +10111,19 @@ static void *pri_dchannel(void *vpri)
+@@ -9851,7 +10113,19 @@ static void *pri_dchannel(void *vpri)
if (pri->nodetype != BRI_NETWORK_PTMP) {
ast_log(LOG_WARNING, "Hangup REQ on bad channel %d/%d on span %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span);
} else {
More information about the Pkg-voip-commits
mailing list