[asterisk-commits] rmudgett: trunk r287693 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Sep 20 18:18:41 2010
New Revision: 287693

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287693
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=287693&r1=287692&r2=287693
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Mon Sep 20 18:18:41 2010
@@ -12426,6 +12426,11 @@
 					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;
 				}