[asterisk-commits] oej: branch 1.4 r128950 - /branches/1.4/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Jul  8 04:52:21 2008
New Revision: 128950

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128950
Log:
Don't hangup the call if we can't resolve the Contact if there's a proxy
route set for the call.
----
This comment was added a while ago and today it hit me badly. 

/* OEJ: Possible issue that may need a check:
	If we have a proxy route between us and the device,
	should we care about resolving the contact
	or should we just send it?
*/

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=128950&r1=128949&r2=128950
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Tue Jul  8 04:52:21 2008
@@ -12256,21 +12256,17 @@
 		if (outgoing) {
 			update_call_counter(p, DEC_CALL_RINGING);
 			parse_ok_contact(p, req);
+			/* Save Record-Route for any later requests we make on this dialogue */
+			if (!reinvite)
+				build_route(p, req, 1);
+
 			if(set_address_from_contact(p)) {
 				/* Bad contact - we don't know how to reach this device */
 				/* We need to ACK, but then send a bye */
-				/* OEJ: Possible issue that may need a check:
-					If we have a proxy route between us and the device,
-					should we care about resolving the contact
-					or should we just send it?
-				*/
-				if (!ast_test_flag(req, SIP_PKT_IGNORE))
+				if (!p->route && !ast_test_flag(req, SIP_PKT_IGNORE))
 					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);	
 			} 
 
-			/* Save Record-Route for any later requests we make on this dialogue */
-			if (!reinvite)
-				build_route(p, req, 1);
 		}
 		
 		if (p->owner && (p->owner->_state == AST_STATE_UP) && (bridgepeer = ast_bridged_channel(p->owner))) { /* if this is a re-invite */