[svn-commits] dvossel: branch dvossel/generic_aoc r256482 - /team/dvossel/generic_aoc/chann...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Apr  8 16:53:09 2010
New Revision: 256482

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256482
Log:
update send aoc_e to match libpri api change to remove need to specify on_release

Modified:
    team/dvossel/generic_aoc/channels/sig_pri.c
    team/dvossel/generic_aoc/channels/sig_pri.h

Modified: team/dvossel/generic_aoc/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/channels/sig_pri.c?view=diff&rev=256482&r1=256481&r2=256482
==============================================================================
--- team/dvossel/generic_aoc/channels/sig_pri.c (original)
+++ team/dvossel/generic_aoc/channels/sig_pri.c Thu Apr  8 16:53:09 2010
@@ -4586,12 +4586,6 @@
 						}
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */
 
-#if defined(HAVE_PRI_AOC_EVENTS)
-						/* since a hangup request event is a disconnect, any resulting AOC-E sent for this call
-						 * should be done on the release now. */
-						pri->pvts[chanpos]->send_aoce_on_release = 1;
-#endif
-
 						switch (e->hangup.cause) {
 						case PRI_CAUSE_USER_BUSY:
 						case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION:
@@ -4922,6 +4916,11 @@
 				pri_call_set_useruser(p->call, useruser);
 #endif
 
+#if defined(HAVE_PRI_AOC_EVENTS)
+				if (p->holding_aoce) {
+					pri_aoc_e_send(p->pri->pri, p->call, &p->aoc_e);
+				}
+#endif
 				pri_hangup(p->pri->pri, p->call, -1);
 				p->call = NULL;
 			} else {
@@ -4941,7 +4940,7 @@
 
 #if defined(HAVE_PRI_AOC_EVENTS)
 				if (p->holding_aoce) {
-					pri_aoc_e_send(p->pri->pri, p->call, &p->aoc_e, p->send_aoce_on_release);
+					pri_aoc_e_send(p->pri->pri, p->call, &p->aoc_e);
 				}
 #endif
 
@@ -4958,7 +4957,6 @@
 
 #if defined(HAVE_PRI_AOC_EVENTS)
 	p->holding_aoce = 0;
-	p->send_aoce_on_release = 0;
 #endif
 
 	ast->tech_pvt = NULL;

Modified: team/dvossel/generic_aoc/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/channels/sig_pri.h?view=diff&rev=256482&r1=256481&r2=256482
==============================================================================
--- team/dvossel/generic_aoc/channels/sig_pri.h (original)
+++ team/dvossel/generic_aoc/channels/sig_pri.h Thu Apr  8 16:53:09 2010
@@ -246,7 +246,6 @@
 #if defined(HAVE_PRI_AOC_EVENTS)
 	struct pri_subcmd_aoc_e aoc_e;
 	unsigned int holding_aoce:1; /*!< received AOC-E msg from asterisk. holding for disconnect/release */
-	unsigned int send_aoce_on_release:1; /*!< indicates if AOC-E msg should be sent on disconnect or release. */
 #endif
 };