[svn-commits] mattf: trunk r135 - in /trunk: mtp2.c mtp3.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Sat Nov 17 17:32:46 2007
New Revision: 135

URL: http://svn.digium.com/view/libss7?view=rev&rev=135
Log:
Fix some more MTP2 automatic restart code

Modified:
    trunk/mtp2.c
    trunk/mtp3.c

Modified: trunk/mtp2.c
URL: http://svn.digium.com/view/libss7/trunk/mtp2.c?view=diff&rev=135&r1=134&r2=135
==============================================================================
--- trunk/mtp2.c (original)
+++ trunk/mtp2.c Sat Nov 17 17:32:46 2007
@@ -571,13 +571,7 @@
 			link->state = newstate;
 			return 0;
 		case MTP_INSERVICE:
-			switch (newstate) {
-				case MTP_IDLE:
-					return to_idle(link);
-				default:
-					mtp_error(link->master, "Unable to change state from %d to %d\n", link->state, newstate);
-					return 0;
-			}
+			return to_idle(link);
 	}
 	return 0;
 }

Modified: trunk/mtp3.c
URL: http://svn.digium.com/view/libss7/trunk/mtp3.c?view=diff&rev=135&r1=134&r2=135
==============================================================================
--- trunk/mtp3.c (original)
+++ trunk/mtp3.c Sat Nov 17 17:32:46 2007
@@ -584,8 +584,10 @@
 			break;
 		}
 	}
-	if (winner > -1)
+	if (winner > -1) {
 		ss7->mtp2_linkstate[winner] = MTP2_LINKSTATE_INALARM;
+		mtp2_stop(ss7->links[winner]);
+	}
 
 	for (i = 0; i < ss7->numlinks; i++) {
 		/* Let's count how many links are up while we're going through them */