From f92fd39b5c43db4564047c0573029fb3f3f781c8 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 20 Sep 2010 23:18:41 +0000 Subject: Merged revisions 287683 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r287683 | rmudgett | 2010-09-20 18:14:42 -0500 (Mon, 20 Sep 2010) | 9 lines The inalarm flag was not set in sig_analog struct if the port is initially in alarm. Fixed initial inalarm value for sig_analog ports. Along with -r261007, this gets the inalarm flag in sync with chan_dahdi for sig_analog ports. (closes issue #16983) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287693 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'channels') diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9b1537fa8..718899108 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -12426,6 +12426,11 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, break; #endif /* defined(HAVE_SS7) */ default: + /* The only sig submodule left should be sig_analog. */ + analog_p = tmp->sig_pvt; + if (analog_p) { + analog_p->inalarm = 1; + } tmp->inalarm = 1; break; } -- cgit v1.2.3