[svn-commits] russell: branch russell/chan_console r95355 - in /team/russell/chan_console: ...

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Dec 29 00:33:09 2007
New Revision: 95355

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95355
Log:
Ignore a couple more indications.

I have made test calls with this over IAX2 and it is working fine.  yay.  :)

Modified:
    team/russell/chan_console/channels/chan_console.c
    team/russell/chan_console/main/channel.c

Modified: team/russell/chan_console/channels/chan_console.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_console.c?view=diff&rev=95355&r1=95354&r2=95355
==============================================================================
--- team/russell/chan_console/channels/chan_console.c (original)
+++ team/russell/chan_console/channels/chan_console.c Sat Dec 29 00:33:09 2007
@@ -456,6 +456,8 @@
 	case AST_CONTROL_RINGING:
 		res = -1;  /* Ask for inband indications */
 		break;
+	case AST_CONTROL_PROGRESS:
+	case AST_CONTROL_PROCEEDING:
 	case AST_CONTROL_VIDUPDATE:
 	case -1:
 		break;

Modified: team/russell/chan_console/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/main/channel.c?view=diff&rev=95355&r1=95354&r2=95355
==============================================================================
--- team/russell/chan_console/main/channel.c (original)
+++ team/russell/chan_console/main/channel.c Sat Dec 29 00:33:09 2007
@@ -463,10 +463,7 @@
 	struct chanlist *chanls;
 	const struct ast_channel_tech *ret = NULL;
 
-	if (AST_RWLIST_RDLOCK(&channels)) {
-		ast_log(LOG_WARNING, "Unable to lock channel tech list\n");
-		return NULL;
-	}
+	AST_RWLIST_RDLOCK(&channels);
 
 	AST_LIST_TRAVERSE(&backends, chanls, list) {
 		if (!strcasecmp(name, chanls->tech->type)) {
@@ -3168,10 +3165,7 @@
 		cause = &foo;
 	*cause = AST_CAUSE_NOTDEFINED;
 
-	if (AST_RWLIST_RDLOCK(&channels)) {
-		ast_log(LOG_WARNING, "Unable to lock channel list\n");
-		return NULL;
-	}
+	AST_RWLIST_RDLOCK(&channels);
 
 	AST_LIST_TRAVERSE(&backends, chan, list) {
 		if (strcasecmp(type, chan->tech->type))