[svn-commits] twilson: trunk r274284 - in /trunk: ./ UPGRADE.txt channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Jul  6 17:15:27 2010
New Revision: 274284

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=274284
Log:
Merged revisions 274280 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r274280 | twilson | 2010-07-06 17:08:20 -0500 (Tue, 06 Jul 2010) | 9 lines
  
  Add option to not do a call forward on 482 Loop Detected
  
  Asterisk has always set up a forwarded call when receiving a 482 Loop Detected.
  This prevents handling the call failure by just continuing on in the dialplan.
  Since this would be a change in behavior, the new option to disable this
  behavior is forwardloopdetected which defaults to 'yes'.
  
  Review: https://reviewboard.asterisk.org/r/764/
........

(no option for trunk, just changing the behavior)

Modified:
    trunk/   (props changed)
    trunk/UPGRADE.txt
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=274284&r1=274283&r2=274284
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Tue Jul  6 17:15:27 2010
@@ -91,6 +91,10 @@
 * The CDR handling of billsec and duration field has changed. If your table
   definition specifies those fields as float,double or similar they will now
   be logged with microsecond accuracy instead of a whole integer.
+
+* chan_sip will no longer set up a local call forward when receiving a
+  482 Loop Detected response. The dialplan will just continue from where it
+  left off.
 
 From 1.6.1 to 1.6.2:
 

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=274284&r1=274283&r2=274284
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jul  6 17:15:27 2010
@@ -19132,16 +19132,7 @@
 						ast_queue_control(p->owner, AST_CONTROL_BUSY);
 					}
 					break;
-				case 482: /*!
-					\note SIP is incapable of performing a hairpin call, which
-					is yet another failure of not having a layer 2 (again, YAY
-					 IETF for thinking ahead).  So we treat this as a call
-					 forward and hope we end up at the right place... */
-					ast_debug(1, "Hairpin detected, setting up call forward for what it's worth\n");
-					if (p->owner)
-						ast_string_field_build(p->owner, call_forward,
-								       "Local/%s@%s", p->username, p->context);
-					/* Fall through */
+				case 482: /* Loop Detected */
 				case 480: /* Temporarily Unavailable */
 				case 404: /* Not Found */
 				case 410: /* Gone */