[asterisk-commits] rmudgett: branch 1.8 r286904 - /branches/1.8/channels/sig_analog.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Sep 15 13:28:05 2010
New Revision: 286904

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286904
Log:
Unable to originate calls using E&M over T1.

When originating a call from Unit Under Test to Reference Unit using E&M
RBS signaling mode, I get the following warning message: "Ring/Off-hook in
strange state 3 on channel 1".

Fixed the sig_analog outgoing flag.  It was never set when sig_analog was
extracted from chan_dahdi.

JIRA SWP-2191
JIRA AST-408

Modified:
    branches/1.8/channels/sig_analog.c

Modified: branches/1.8/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/sig_analog.c?view=diff&rev=286904&r1=286903&r2=286904
==============================================================================
--- branches/1.8/channels/sig_analog.c (original)
+++ branches/1.8/channels/sig_analog.c Wed Sep 15 13:28:05 2010
@@ -691,6 +691,8 @@
 
 struct ast_channel * analog_request(struct analog_pvt *p, int *callwait, const struct ast_channel *requestor)
 {
+	struct ast_channel *ast;
+
 	ast_log(LOG_DEBUG, "%s %d\n", __FUNCTION__, p->channel);
 	*callwait = (p->owner != NULL);
 
@@ -701,7 +703,13 @@
 		}
 	}
 
-	return analog_new_ast_channel(p, AST_STATE_RESERVED, 0, p->owner ? ANALOG_SUB_CALLWAIT : ANALOG_SUB_REAL, requestor);
+	p->outgoing = 1;
+	ast = analog_new_ast_channel(p, AST_STATE_RESERVED, 0,
+		p->owner ? ANALOG_SUB_CALLWAIT : ANALOG_SUB_REAL, requestor);
+	if (!ast) {
+		p->outgoing = 0;
+	}
+	return ast;
 }
 
 int analog_available(struct analog_pvt *p)
@@ -912,6 +920,7 @@
 	}
 
 	p->dialednone = 0;
+	p->outgoing = 1;
 
 	mysig = p->sig;
 	if (p->outsigmod > -1) {