[Pkg-voip-commits] r5107 - in /asterisk/trunk/debian: changelog patches/bristuff/app-dial-etc patches/bristuff/app-dial-priority-202 patches/bristuff/chan-iax2-hangup-cause patches/bristuff/zapata-bri+euroisdn
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Dec 20 05:29:26 UTC 2007
Author: paravoid
Date: Thu Dec 20 05:29:26 2007
New Revision: 5107
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5107
Log:
- Adapt bristuff patches app-dial-etc, chan-iax2-hangup-cause,
app-dial-priority-202, zapata-bri+euroisdn.
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/bristuff/app-dial-etc
asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5107&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Dec 20 05:29:26 2007
@@ -4,11 +4,13 @@
* New upstream release (Fixes CVE-2007-6430)
- Remove keep-1.4-abi, merged upstream.
- Adapt hack-multiple-app-voicemail, use-libpri-bristuffed.
+ - Adapt bristuff patches app-dial-etc, chan-iax2-hangup-cause,
+ app-dial-priority-202, zapata-bri+euroisdn.
* Silence upstream's build sum warning but generate one on all modules so
that we can enable it at a later point.
* Make the init script's detection of a running daemon to be more precise.
- -- Faidon Liambotis <paravoid at debian.org> Thu, 20 Dec 2007 07:17:03 +0200
+ -- Faidon Liambotis <paravoid at debian.org> Thu, 20 Dec 2007 07:28:32 +0200
asterisk (1:1.4.15~dfsg-1) unstable; urgency=low
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-etc
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-etc?rev=5107&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-etc (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-etc Thu Dec 20 05:29:26 2007
@@ -1,9 +1,9 @@
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -65,6 +65,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
- #include "asterisk/manager.h"
#include "asterisk/privacy.h"
#include "asterisk/stringfields.h"
+ #include "asterisk/global_datastores.h"
+#include "asterisk/transcap.h"
static char *app = "Dial";
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-priority-202?rev=5107&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 Thu Dec 20 05:29:26 2007
@@ -21,12 +21,16 @@
" k - Allow the called party to enable parking of the call by sending\n"
" the DTMF sequence defined for call parking in features.conf.\n"
" K - Allow the calling party to enable parking of the call by sending\n"
-@@ -1283,10 +1288,12 @@ static int dial_exec_full(struct ast_cha
+@@ -1300,14 +1305,16 @@ static int dial_exec_full(struct ast_cha
}
if (!outgoing) {
- strcpy(status, "CHANUNAVAIL");
+ ast_copy_string(status, "CHANUNAVAIL", sizeof(status));
+ if(fulldial == num_dialed) {
+ res = -1;
+ goto out;
+ }
+ /* See if there is a special message */
+ ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 201);
} else {
Modified: asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause?rev=5107&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause Thu Dec 20 05:29:26 2007
@@ -11,11 +11,11 @@
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
@@ -3179,7 +3182,7 @@ static int iax2_hangup(struct ast_channe
- memset(&ied, 0, sizeof(ied));
ast_mutex_lock(&iaxsl[callno]);
if (callno && iaxs[callno]) {
-- ast_log(LOG_DEBUG, "We're hanging up %s now...\n", c->name);
-+ ast_log(LOG_DEBUG, "We're hanging up %s with cause %i now...\n", c->name, c->hangupcause);
+ if (option_debug)
+- ast_log(LOG_DEBUG, "We're hanging up %s now...\n", c->name);
++ ast_log(LOG_DEBUG, "We're hanging up %s with cause %i now...\n", c->name, c->hangupcause);
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);
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=5107&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Dec 20 05:29:26 2007
@@ -1282,7 +1282,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) {
-@@ -8834,29 +9175,78 @@ static void *pri_dchannel(void *vpri)
+@@ -8847,34 +9188,82 @@ 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);
@@ -1310,8 +1310,13 @@
- else if (!ast_strlen_zero(e->ring.callednum)) {
- ast_copy_string(pri->pvts[chanpos]->exten, e->ring.callednum, sizeof(pri->pvts[chanpos]->exten));
- ast_copy_string(pri->pvts[chanpos]->dnid, e->ring.callednum, sizeof(pri->pvts[chanpos]->dnid));
-- } else
+- } else if (pri->overlapdial)
- pri->pvts[chanpos]->exten[0] = '\0';
+- else {
+- /* Some PRI circuits are set up to send _no_ digits. Handle them as 's'. */
+- pri->pvts[chanpos]->exten[0] = 's';
+- pri->pvts[chanpos]->exten[1] = '\0';
+- }
- /* Set DNID on all incoming calls -- even immediate */
- if (!ast_strlen_zero(e->ring.callednum))
- ast_copy_string(pri->pvts[chanpos]->dnid, e->ring.callednum, sizeof(pri->pvts[chanpos]->dnid));
@@ -1333,8 +1338,12 @@
+ /* fix for .at p2p bri lines */
+ pri->pvts[chanpos]->exten[0] = 's';
+ pri->pvts[chanpos]->exten[1] = '\0';
++ } else if (pri->overlapdial) {
++ pri->pvts[chanpos]->exten[0] = '\0';
+ } else {
-+ pri->pvts[chanpos]->exten[0] = '\0';
++ /* Some PRI circuits are set up to send _no_ digits. Handle them as 's'. */
++ pri->pvts[chanpos]->exten[0] = 's';
++ pri->pvts[chanpos]->exten[1] = '\0';
+ }
+ }
+ /* No number yet, but received "sending complete"? */
More information about the Pkg-voip-commits
mailing list