[asterisk-commits] mnicholson: trunk r286869 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Sep 15 08:10:50 2010
New Revision: 286869

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

........
  r286868 | mnicholson | 2010-09-15 08:05:52 -0500 (Wed, 15 Sep 2010) | 16 lines
  
  Set tohost to the domain specified in the configuration file instead of the IP address of the host we are calling.
  
  This fixes a regression introduced in r274783.
  
  (closes issue #17960)
  Reported by: adriavidal
  Patches:
        sip-tohost-fix1.diff uploaded by mnicholson (license 96)
  Tested by: mich, mnicholson, adriavidal
  
  (closes issue #17676)
  Reported by: outcast
  Patches:
        sip-tohost-fix1.diff uploaded by mnicholson (license 96)
  Tested by: mnicholson
........

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=286869&r1=286868&r2=286869
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Sep 15 08:10:50 2010
@@ -26173,9 +26173,8 @@
 			return NULL;
 		}
 
-		ast_string_field_set(peer, tohost, peer->dnsmgr ? srvlookup :
-				     ast_sockaddr_stringify_host(&peer->addr));
-		
+		ast_string_field_set(peer, tohost, srvlookup);
+
 		if (global_dynamic_exclude_static) {
 			int err = 0;
 			sip_cfg.contact_ha = ast_append_ha("deny", ast_sockaddr_stringify_addr(&peer->addr),