[asterisk-commits] file: branch 1.4 r63656 - /branches/1.4/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed May  9 12:43:30 2007
New Revision: 63656

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63656
Log:
Do not prematurely go on hold if sendonly was not actually set.

Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=63656&r1=63655&r2=63656
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Wed May  9 12:43:30 2007
@@ -5238,7 +5238,7 @@
 		ast_queue_control(p->owner, AST_CONTROL_UNHOLD);
 		/* Activate a re-invite */
 		ast_queue_frame(p->owner, &ast_null_frame);
-	} else if (!sin.sin_addr.s_addr || sendonly) {
+	} else if (!sin.sin_addr.s_addr || (sendonly && sendonly != -1)) {
 		ast_queue_control_data(p->owner, AST_CONTROL_HOLD, 
 				       S_OR(p->mohsuggest, NULL),
 				       !ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0);
@@ -5261,7 +5261,7 @@
 		if (global_notifyhold)
 			sip_peer_hold(p, 0);
 		ast_clear_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD);	/* Clear both flags */
-	} else if (!sin.sin_addr.s_addr || sendonly ) {
+	} else if (!sin.sin_addr.s_addr || (sendonly && sendonly != -1)) {
 		/* No address for RTP, we're on hold */
 		append_history(p, "Hold", "%s", req->data);