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

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Jul  7 10:26:42 2011
New Revision: 326682

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

........
  r326681 | mnicholson | 2011-07-07 10:25:49 -0500 (Thu, 07 Jul 2011) | 3 lines
  
  make the uri parameter used in reply digests more standards compliant in
  certain cases by prepending "sip:" or "sips:" to it
........

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=326682&r1=326681&r2=326682
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jul  7 10:26:42 2011
@@ -19137,7 +19137,7 @@
 	struct sip_auth_container *credentials;
 
 	if (!ast_strlen_zero(p->domain))
-		ast_copy_string(uri, p->domain, sizeof(uri));
+		snprintf(uri, sizeof(uri), "%s:%s", p->socket.type == SIP_TRANSPORT_TLS ? "sips" : "sip", p->domain);
 	else if (!ast_strlen_zero(p->uri))
 		ast_copy_string(uri, p->uri, sizeof(uri));
 	else