[asterisk-commits] bbryant: trunk r284973 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Fri Sep  3 13:21:47 2010
New Revision: 284973

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

................
  r284967 | bbryant | 2010-09-03 14:19:53 -0400 (Fri, 03 Sep 2010) | 15 lines
  
  Merged revisions 284958 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r284958 | bbryant | 2010-09-03 14:15:49 -0400 (Fri, 03 Sep 2010) | 8 lines
    
    This is a patch provided for issue #17935 to add the ActionID to the IAXregistry AMI response.
    
    (closes issue #17935)
    Reported by: alexkuklin
    Patches: 
          iaxshowreg uploaded by alexkuklin (license 1115)
    Tested by: alexkuklin
  ........
................

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

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

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=284973&r1=284972&r2=284973
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Fri Sep  3 13:21:47 2010
@@ -7047,13 +7047,14 @@
 		
 		astman_append(s,
 			"Event: RegistryEntry\r\n"
+			"%s"
 			"Host: %s\r\n"
 			"DNSmanager: %s\r\n"
 			"Username: %s\r\n"
 			"Perceived: %s\r\n"
 			"Refresh: %d\r\n"
 			"State: %s\r\n"
-			"\r\n", host, (reg->dnsmgr) ? "Y" : "N", reg->username, perceived, 
+			"\r\n", idtext, host, (reg->dnsmgr) ? "Y" : "N", reg->username, perceived, 
 			reg->refresh, regstate2str(reg->regstate));
 
 		total++;