[svn-commits] seanbright: trunk r329897 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Thu Jul 28 06:36:12 2011
New Revision: 329897

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

................
  r329896 | seanbright | 2011-07-28 07:35:27 -0400 (Thu, 28 Jul 2011) | 9 lines
  
  Merged revisions 329895 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329895 | seanbright | 2011-07-28 07:34:33 -0400 (Thu, 28 Jul 2011) | 2 lines
    
    Make the output of Externhost in 'sip show settings' more consistent.
  ........
................

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-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=329897&r1=329896&r2=329897
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jul 28 06:36:12 2011
@@ -17997,7 +17997,7 @@
 		msg = "Enabled using externaddr";
 	ast_cli(a->fd, "  SIP address remapping:  %s\n", msg);
 	ast_cli(a->fd, "  Externhost:             %s\n", S_OR(externhost, "<none>"));
-	ast_cli(a->fd, "  externaddr:               %s\n", ast_sockaddr_stringify(&externaddr));
+	ast_cli(a->fd, "  Externaddr:             %s\n", ast_sockaddr_stringify(&externaddr));
 	ast_cli(a->fd, "  Externrefresh:          %d\n", externrefresh);
 	{
 		struct ast_ha *d;