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

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Jul  7 10:28:47 2011
New Revision: 326684

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

........
  r326683 | mnicholson | 2011-07-07 10:28:25 -0500 (Thu, 07 Jul 2011) | 3 lines
  
  use sips: or sip: depending on the transport in use when building reply digest
  URIs
........

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=326684&r1=326683&r2=326684
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jul  7 10:28:47 2011
@@ -19141,7 +19141,7 @@
 	else if (!ast_strlen_zero(p->uri))
 		ast_copy_string(uri, p->uri, sizeof(uri));
 	else
-		snprintf(uri, sizeof(uri), "sip:%s@%s", p->username, ast_sockaddr_stringify_host_remote(&p->sa));
+		snprintf(uri, sizeof(uri), "%s:%s@%s", p->socket.type == SIP_TRANSPORT_TLS ? "sips" : "sip", p->username, ast_sockaddr_stringify_host_remote(&p->sa));
 
 	snprintf(cnonce, sizeof(cnonce), "%08lx", ast_random());