[asterisk-commits] tilghman: branch 1.6.1 r156288 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Nov 12 13:05:09 2008
New Revision: 156288

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156288
Log:
Merged revisions 156243 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r156243 | tilghman | 2008-11-12 12:55:18 -0600 (Wed, 12 Nov 2008) | 18 lines
  
  Merged revisions 156229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156229 | tilghman | 2008-11-12 12:39:21 -0600 (Wed, 12 Nov 2008) | 11 lines
    
    Revert revision 132506, since it occasionally caused IAX2 HANGUP packets not
    to be sent, and instead, schedule a task to destroy the iax2 pvt structure
    10 seconds later.  This allows the IAX2 HANGUP packet to be queued,
    transmitted, and ACKed before the pvt is destroyed.
    (closes issue #13645)
     Reported by: dzajro
     Patches: 
           20081111__bug13645__3.diff.txt uploaded by Corydon76 (license 14)
     Tested by: vazir
     Reviewed: http://reviewboard.digium.com/r/51/
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=156288&r1=156287&r2=156288
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Wed Nov 12 13:05:09 2008
@@ -802,6 +802,7 @@
 static AST_LIST_HEAD_STATIC(dynamic_list, iax2_thread);
 
 static void *iax2_process_thread(void *data);
+static void iax2_destroy(int callno);
 
 static void signal_condition(ast_mutex_t *lock, ast_cond_t *cond)
 {
@@ -1451,6 +1452,20 @@
 {
 	AST_SCHED_DEL(sched, fr->retrans);
 	iax_frame_free(fr);
+}
+
+static int scheduled_destroy(const void *vid)
+{
+	short callno = PTR_TO_CALLNO(vid);
+	ast_mutex_lock(&iaxsl[callno]);
+	if (iaxs[callno]) {
+		if (option_debug) {
+			ast_log(LOG_DEBUG, "Really destroying %d now...\n", callno);
+		}
+		iax2_destroy(callno);
+	}
+	ast_mutex_unlock(&iaxsl[callno]);
+	return 0;
 }
 
 static void pvt_destructor(void *obj)
@@ -3795,14 +3810,18 @@
 {
 	unsigned short callno = PTR_TO_CALLNO(c->tech_pvt);
  	struct iax_ie_data ied;
+	int alreadygone;
  	memset(&ied, 0, sizeof(ied));
 	ast_mutex_lock(&iaxsl[callno]);
 	if (callno && iaxs[callno]) {
 		ast_debug(1, "We're hanging up %s now...\n", c->name);
+		alreadygone = ast_test_flag(iaxs[callno], IAX_ALREADYGONE);
 		/* Send the hangup unless we have had a transmission error or are already gone */
  		iax_ie_append_byte(&ied, IAX_IE_CAUSECODE, (unsigned char)c->hangupcause);
-		if (!iaxs[callno]->error && !ast_test_flag(iaxs[callno], IAX_ALREADYGONE)) {
- 			send_command_final(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_HANGUP, 0, ied.buf, ied.pos, -1);
+		if (!iaxs[callno]->error && !alreadygone) {
+ 			if (send_command_final(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_HANGUP, 0, ied.buf, ied.pos, -1)) {
+				ast_log(LOG_WARNING, "No final packet could be sent for callno %d\n", callno);
+			}
 			if (!iaxs[callno]) {
 				ast_mutex_unlock(&iaxsl[callno]);
 				return 0;
@@ -3811,9 +3830,14 @@
 		/* Explicitly predestroy it */
 		iax2_predestroy(callno);
 		/* If we were already gone to begin with, destroy us now */
-		if (iaxs[callno]) {
+		if (iaxs[callno] && alreadygone) {
 			ast_debug(1, "Really destroying %s now...\n", c->name);
 			iax2_destroy(callno);
+		} else if (iaxs[callno]) {
+			if (ast_sched_add(sched, 10000, scheduled_destroy, CALLNO_TO_PTR(callno)) < 0) {
+				ast_log(LOG_ERROR, "Unable to schedule iax2 callno %d destruction?!!  Destroying immediately.\n", callno);
+				iax2_destroy(callno);
+			}
 		}
 	} else if (c->tech_pvt) {
 		/* If this call no longer exists, but the channel still