[asterisk-commits] bebuild: tag 10.5.1-digiumphones r368952 - in /tags/10.5.1-digiumphones: ./ c...

[SVN commits to the Asterisk project]

Author: bebuild
Date: Thu Jun 14 13:17:03 2012
New Revision: 368952

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368952
Log:
Merge r368947, update ChangeLog and version

Removed:
    tags/10.5.1-digiumphones/asterisk-10.5.0-digiumphones-summary.html
    tags/10.5.1-digiumphones/asterisk-10.5.0-digiumphones-summary.txt
Modified:
    tags/10.5.1-digiumphones/   (props changed)
    tags/10.5.1-digiumphones/.version
    tags/10.5.1-digiumphones/ChangeLog
    tags/10.5.1-digiumphones/channels/chan_skinny.c

Propchange: tags/10.5.1-digiumphones/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 14 13:17:03 2012
@@ -1,1 +1,1 @@
-/branches/10:367267,367562,367782,367844
+/branches/10:367267,367562,367782,367844,368947

Modified: tags/10.5.1-digiumphones/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.5.1-digiumphones/.version?view=diff&rev=368952&r1=368951&r2=368952
==============================================================================
--- tags/10.5.1-digiumphones/.version (original)
+++ tags/10.5.1-digiumphones/.version Thu Jun 14 13:17:03 2012
@@ -1,1 +1,1 @@
-10.5.0-digiumphones
+10.5.1-digiumphones

Modified: tags/10.5.1-digiumphones/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.5.1-digiumphones/ChangeLog?view=diff&rev=368952&r1=368951&r2=368952
==============================================================================
--- tags/10.5.1-digiumphones/ChangeLog (original)
+++ tags/10.5.1-digiumphones/ChangeLog Thu Jun 14 13:17:03 2012
@@ -1,3 +1,9 @@
+2012-06-14  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 10.5.1-digiumphones Released.
+
+	* AST-2012-009
+
 2012-06-04  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 10.5.0-digiumphones Released.

Modified: tags/10.5.1-digiumphones/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.5.1-digiumphones/channels/chan_skinny.c?view=diff&rev=368952&r1=368951&r2=368952
==============================================================================
--- tags/10.5.1-digiumphones/channels/chan_skinny.c (original)
+++ tags/10.5.1-digiumphones/channels/chan_skinny.c Thu Jun 14 13:17:03 2012
@@ -4982,6 +4982,11 @@
 	pthread_t t;
 	int actualstate = state;
 
+	if (!l->device) {
+		ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+		return;
+	}
+
 	if (sub->substate == SUBSTATE_ONHOOK) {
 		return;
 	}
@@ -5374,15 +5379,20 @@
 	struct skinny_subchannel *activatesub = NULL;
 	struct skinny_subchannel *tsub;
 
+	if (!l->device) {
+		ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+		return;
+	}
+
 	if (skinnydebug) {
 		ast_verb(3, "Sub %d - Dumping\n", sub->callid);
 	}
-	
+
 	if (!forcehangup && sub->substate == SUBSTATE_HOLD) {
 		l->activesub = NULL;
 		return;
 	}
-	
+
 	if (sub == l->activesub) {
 		d->hookstate = SKINNY_ONHOOK;
 		transmit_speaker_mode(d, SKINNY_SPEAKEROFF);