[svn-commits] jpeeler: branch jpeeler/bug16709 r250299 - /team/jpeeler/bug16709/channels/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Mar  2 21:57:09 2010
New Revision: 250299

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250299
Log:
move the marking of the channels out of build_channels so that each channel per span is only marked once

Modified:
    team/jpeeler/bug16709/channels/chan_dahdi.c

Modified: team/jpeeler/bug16709/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/jpeeler/bug16709/channels/chan_dahdi.c?view=diff&rev=250299&r1=250298&r2=250299
==============================================================================
--- team/jpeeler/bug16709/channels/chan_dahdi.c (original)
+++ team/jpeeler/bug16709/channels/chan_dahdi.c Tue Mar  2 21:57:09 2010
@@ -15768,16 +15768,6 @@
 					(reload == 1) ? "reconfigure" : "register", value);
 				return -1;
 			}
-		}
-	}
-
-	/* Mark the first channels of each Span to watch for their Span alarms */
-	for (tmp = iflist, x=-1; tmp; tmp = tmp->next) {
-		if (!tmp->destroy && tmp->span != x) {
-			tmp->manages_span_alarms = 1;
-			x = tmp->span; 
-		} else {
-			tmp->manages_span_alarms = 0;
 		}
 	}
 
@@ -16801,6 +16791,17 @@
 			return -1;
 		}
 	}
+
+	/* mark the first channels of each span to watch for their span alarms */
+	for (tmp = iflist, y=-1; tmp; tmp = tmp->next) {
+		if (!tmp->destroy && tmp->span != y) {
+			tmp->manages_span_alarms = 1;
+			y = tmp->span; 
+		} else {
+			tmp->manages_span_alarms = 0;
+		}
+	}
+
 	/*< \todo why check for the pseudo in the per-channel section.
 	 * Any actual use for manual setup of the pseudo channel? */
 	if (!found_pseudo && reload != 1) {