Merge timing patch from Paul

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@456 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 9 insertions, 0 deletions

diff --git a/zaptel.c b/zaptel.c
index ad16273..d656492 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -2576,6 +2576,15 @@ void zt_alarm_notify(struct zt_span *span)
 		span->lastalarms = span->alarms;
 		for (x=0;x < span->channels;x++)
 			zt_qevent_lock(&span->chans[x], j);
+		/* Switch to other master if current master in alarm */
+		for (x=1; x<maxspans; x++) {
+			if (spans[x] && !spans[x]->alarms) {
+				if(master != spans[x])
+					printk("Zaptel: Master changed to %s\n", spans[x]->name);
+				master = spans[x];
+				break;
+			}
+		}
 	}
 }