[asterisk-commits] rmudgett: branch rmudgett/hold_retrieve r299186 - /team/rmudgett/hold_retriev...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Dec 20 13:29:10 2010
New Revision: 299186

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299186
Log:
Remove MOH FSM remote hold event support.

The remote hold event should not be used because the remote party hold
notifications will not happen.  The following sequence demonstrates:

1) A puts B on hold.  B gets notified he is on hold.
2) B puts A on hold.
3) B takes A off of hold.
4) B will not get a notification when A takes B off of hold.

Modified:
    team/rmudgett/hold_retrieve/channels/sig_pri.c
    team/rmudgett/hold_retrieve/channels/sig_pri.h

Modified: team/rmudgett/hold_retrieve/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/hold_retrieve/channels/sig_pri.c?view=diff&rev=299186&r1=299185&r2=299186
==============================================================================
--- team/rmudgett/hold_retrieve/channels/sig_pri.c (original)
+++ team/rmudgett/hold_retrieve/channels/sig_pri.c Mon Dec 20 13:29:10 2010
@@ -4153,9 +4153,6 @@
 	case SIG_PRI_MOH_EVENT_RETRIEVE_REJ:
 		str = "SIG_PRI_MOH_EVENT_RETRIEVE_REJ";
 		break;
-	case SIG_PRI_MOH_EVENT_REMOTE_HOLD_ACK:
-		str = "SIG_PRI_MOH_EVENT_REMOTE_HOLD_ACK";
-		break;
 	case SIG_PRI_MOH_EVENT_REMOTE_RETRIEVE_ACK:
 		str = "SIG_PRI_MOH_EVENT_REMOTE_RETRIEVE_ACK";
 		break;
@@ -4333,20 +4330,6 @@
 		ast_moh_stop(chan);
 		next_state = SIG_PRI_MOH_STATE_IDLE;
 		break;
-#if defined(HAVE_PRI_CALL_HOLD)
-	case SIG_PRI_MOH_EVENT_REMOTE_HOLD_ACK:
-		if (pvt->pri->moh_signaling == SIG_PRI_MOH_SIGNALING_HOLD) {
-			/*
-			 * Switch to HOLD/RETRIEVE method since that is what we really
-			 * want anyway.
-			 */
-			if (chan) {
-				ast_moh_stop(chan);
-			}
-			next_state = SIG_PRI_MOH_STATE_HOLD;
-		}
-		break;
-#endif	/* defined(HAVE_PRI_CALL_HOLD) */
 	default:
 		break;
 	}
@@ -4389,7 +4372,6 @@
 		next_state = SIG_PRI_MOH_STATE_MOH;
 		break;
 	case SIG_PRI_MOH_EVENT_HOLD_ACK:
-	case SIG_PRI_MOH_EVENT_REMOTE_HOLD_ACK:
 		next_state = SIG_PRI_MOH_STATE_HOLD;
 		break;
 	default:
@@ -6624,14 +6606,6 @@
 						PRI_CAUSE_RESOURCE_UNAVAIL_UNSPECIFIED);
 				} else {
 					pri_hold_ack(pri->pri, e->hold.call);
-					chanpos = pri_find_principle_by_call(pri, e->hold.call);
-					if (chanpos < 0) {
-						break;
-					}
-					sig_pri_lock_private(pri->pvts[chanpos]);
-					sig_pri_moh_fsm_event(pri->pvts[chanpos]->owner, pri->pvts[chanpos],
-						SIG_PRI_MOH_EVENT_REMOTE_HOLD_ACK);
-					sig_pri_unlock_private(pri->pvts[chanpos]);
 				}
 				break;
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */

Modified: team/rmudgett/hold_retrieve/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/hold_retrieve/channels/sig_pri.h?view=diff&rev=299186&r1=299185&r2=299186
==============================================================================
--- team/rmudgett/hold_retrieve/channels/sig_pri.h (original)
+++ team/rmudgett/hold_retrieve/channels/sig_pri.h Mon Dec 20 13:29:10 2010
@@ -136,8 +136,6 @@
 	SIG_PRI_MOH_EVENT_RETRIEVE_ACK,
 	/*! The unhold request was rejected. */
 	SIG_PRI_MOH_EVENT_RETRIEVE_REJ,
-	/*! The remote party placed this channel on hold. */
-	SIG_PRI_MOH_EVENT_REMOTE_HOLD_ACK,
 	/*! The remote party took this channel off hold. */
 	SIG_PRI_MOH_EVENT_REMOTE_RETRIEVE_ACK,
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */