[asterisk-commits] rmudgett: branch rmudgett/ss7_27_knk r375144 - /team/rmudgett/ss7_27_knk/chan...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Oct 17 12:56:13 2012
New Revision: 375144

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375144
Log:
Move sig_ss7_is_chan_available() in preparation for ASTERISK-20204 fix.

Modified:
    team/rmudgett/ss7_27_knk/channels/sig_ss7.c

Modified: team/rmudgett/ss7_27_knk/channels/sig_ss7.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/channels/sig_ss7.c?view=diff&rev=375144&r1=375143&r2=375144
==============================================================================
--- team/rmudgett/ss7_27_knk/channels/sig_ss7.c (original)
+++ team/rmudgett/ss7_27_knk/channels/sig_ss7.c Wed Oct 17 12:56:13 2012
@@ -309,6 +309,24 @@
 		return sig_ss7_callbacks.find_linkset(ss7);
 	}
 	return NULL;
+}
+
+/*!
+ * \internal
+ * \brief Determine if a private channel structure is available.
+ *
+ * \param pvt Channel to determine if available.
+ *
+ * \return TRUE if the channel is available.
+ */
+static int sig_ss7_is_chan_available(struct sig_ss7_chan *pvt)
+{
+	if (pvt->inservice && !pvt->inalarm && !pvt->owner && !pvt->ss7call
+		&& pvt->call_level == SIG_SS7_CALL_LEVEL_IDLE
+		&& !pvt->locallyblocked && !pvt->remotelyblocked) {
+		return 1;
+	}
+	return 0;
 }
 
 /*!
@@ -821,24 +839,6 @@
 			}
 		}
 	}
-}
-
-/*!
- * \internal
- * \brief Determine if a private channel structure is available.
- *
- * \param pvt Channel to determine if available.
- *
- * \return TRUE if the channel is available.
- */
-static int sig_ss7_is_chan_available(struct sig_ss7_chan *pvt)
-{
-	if (pvt->inservice && !pvt->inalarm && !pvt->owner && !pvt->ss7call
-		&& pvt->call_level == SIG_SS7_CALL_LEVEL_IDLE
-		&& !pvt->locallyblocked && !pvt->remotelyblocked) {
-		return 1;
-	}
-	return 0;
 }
 
 /*!
@@ -1710,6 +1710,7 @@
 				 * are in the process of creating an owner for it.
 				 */
 				ast_assert(!p->owner && p->call_level == SIG_SS7_CALL_LEVEL_IDLE);
+/* BUGBUG need to handle the case where a call comes in on a cic that is in alarm status. ASTERISK-20204 */
 
 				/* Mark channel as in use so no outgoing call will steal it. */
 				p->call_level = SIG_SS7_CALL_LEVEL_ALLOCATED;