[asterisk-commits] bebuild: tag 10.9.0-rc2 r374295 - in /tags/10.9.0-rc2: ./ channels/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Oct 3 09:22:59 CDT 2012


Author: bebuild
Date: Wed Oct  3 09:22:53 2012
New Revision: 374295

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374295
Log:
Merge Changes for 10.9.0-rc2

This includes r373879 for ASTERISK-20390; r373179 and r373533 for ASTERISK-20409

Removed:
    tags/10.9.0-rc2/asterisk-10.9.0-rc1-summary.html
    tags/10.9.0-rc2/asterisk-10.9.0-rc1-summary.txt
Modified:
    tags/10.9.0-rc2/   (props changed)
    tags/10.9.0-rc2/.version
    tags/10.9.0-rc2/ChangeLog
    tags/10.9.0-rc2/channels/chan_local.c
    tags/10.9.0-rc2/channels/chan_sip.c

Propchange: tags/10.9.0-rc2/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: tags/10.9.0-rc2/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/10:373179,373533,373879

Modified: tags/10.9.0-rc2/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.9.0-rc2/.version?view=diff&rev=374295&r1=374294&r2=374295
==============================================================================
--- tags/10.9.0-rc2/.version (original)
+++ tags/10.9.0-rc2/.version Wed Oct  3 09:22:53 2012
@@ -1,1 +1,1 @@
-10.9.0-rc1
+10.9.0-rc2

Modified: tags/10.9.0-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.9.0-rc2/ChangeLog?view=diff&rev=374295&r1=374294&r2=374295
==============================================================================
--- tags/10.9.0-rc2/ChangeLog (original)
+++ tags/10.9.0-rc2/ChangeLog Wed Oct  3 09:22:53 2012
@@ -1,3 +1,31 @@
+2012-10-03  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 10.9.0-rc2 Released.
+
+	* Fix an issue where Local channels dialed by app_queue are considered
+	  in use immediately.
+
+	  The chan_local channel driver returns a device state of in use even
+	  if a created Local channel has not yet been dialed.  This fix
+	  changes the logic to return a state of not in use until the channel
+	  itself has been dialed.
+
+	  (closes issue ASTERISK-20390)
+	  Reported by: time_ringenbach
+
+	* Fix a regression where direct media was not permitted for calls
+	  using SIP INFO DTMF
+
+	  A change was committed to fix direct media ACL support.  This change
+	  wrongly assumed that only a single channel technology structure
+	  exists for chan_sip.  This is in fact false as a second exists for
+	  calls using SIP INFO DTMF.  The code which performs direct media ACL
+	  checking now checks for both the non-INFO DTMF and INFO DTMF channel
+	  technology structures.
+
+	  (closes issue ASTERISK-20409)
+	  Reported by: michele ciciotti privatewave
+
 2012-09-13  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 10.9.0-rc1 Released.

Modified: tags/10.9.0-rc2/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.9.0-rc2/channels/chan_local.c?view=diff&rev=374295&r1=374294&r2=374295
==============================================================================
--- tags/10.9.0-rc2/channels/chan_local.c (original)
+++ tags/10.9.0-rc2/channels/chan_local.c Wed Oct  3 09:22:53 2012
@@ -307,11 +307,13 @@
 	res = AST_DEVICE_NOT_INUSE;
 
 	it = ao2_iterator_init(locals, 0);
-	while ((lp = ao2_iterator_next(&it))) {
+	while ((lp = ao2_iterator_next(&it)) && (res == AST_DEVICE_NOT_INUSE)) {
 		if (!strcmp(exten, lp->exten) && !strcmp(context, lp->context) && lp->owner) {
-			res = AST_DEVICE_INUSE;
-			ao2_ref(lp, -1);
-			break;
+			ao2_lock(lp);
+			if (ast_test_flag(lp, LOCAL_LAUNCHED_PBX)) {
+				res = AST_DEVICE_INUSE;
+			}
+			ao2_unlock(lp);
 		}
 		ao2_ref(lp, -1);
 	}

Modified: tags/10.9.0-rc2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.9.0-rc2/channels/chan_sip.c?view=diff&rev=374295&r1=374294&r2=374295
==============================================================================
--- tags/10.9.0-rc2/channels/chan_sip.c (original)
+++ tags/10.9.0-rc2/channels/chan_sip.c Wed Oct  3 09:22:53 2012
@@ -30185,7 +30185,8 @@
 
 	if (!(opp_chan = ast_bridged_channel(chan))) {
 		return NULL;
-	} else if ((opp_chan->tech != &sip_tech) || (!(opp = opp_chan->tech_pvt))) {
+	} else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
+		   (!(opp = opp_chan->tech_pvt))) {
 		return NULL;
 	}
 
@@ -30263,7 +30264,8 @@
 
 	if (!(opp_chan = ast_bridged_channel(chan))) {
 		return AST_RTP_GLUE_RESULT_FORBID;
-	} else if ((opp_chan->tech != &sip_tech) || (!(opp = opp_chan->tech_pvt))) {
+	} else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
+		   (!(opp = opp_chan->tech_pvt))) {
 		return AST_RTP_GLUE_RESULT_FORBID;
 	}
 
@@ -30318,7 +30320,8 @@
 
 	if (!(opp_chan = ast_bridged_channel(chan))) {
 		return AST_RTP_GLUE_RESULT_FORBID;
-	} else if ((opp_chan->tech != &sip_tech) || (!(opp = opp_chan->tech_pvt))) {
+	} else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
+		   (!(opp = opp_chan->tech_pvt))) {
 		return AST_RTP_GLUE_RESULT_FORBID;
 	}
 
@@ -30364,7 +30367,8 @@
 
 	if (!(opp_chan = ast_bridged_channel(chan))) {
 		return AST_RTP_GLUE_RESULT_FORBID;
-	} else if ((opp_chan->tech != &sip_tech) || (!(opp = opp_chan->tech_pvt))) {
+	} else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
+		   (!(opp = opp_chan->tech_pvt))) {
 		return AST_RTP_GLUE_RESULT_FORBID;
 	}
 




More information about the asterisk-commits mailing list