From: Olle Johansson <oej@edvina.net>
Date: Thu, 10 Sep 2009 12:11:07 +0000 (+0000)
Subject: Merged revisions 217593 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3205bd2c30cd4a1f1fc8a2a54fc5c13830d676f7;p=thirdparty%2Fasterisk.git

Merged revisions 217593 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r217593 | oej | 2009-09-10 14:06:55 +0200 (Tor, 10 Sep 2009) | 8 lines

Include ActionID in all events that are responsed to AMI Action SIPShowRegistry

(closes issue #15868)
Reported by: nic_bellamy
Patches:
      manager_SIPshowregistry_actionid.patch uploaded by nic bellamy (license 299)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7dccd95bda..5fda830ce2 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13274,13 +13274,14 @@ static int manager_show_registry(struct mansession *s, const struct message *m)
 		ASTOBJ_RDLOCK(iterator);
 		astman_append(s,
 			"Event: RegistryEntry\r\n"
+			"%s"
 			"Host: %s\r\n"
 			"Port: %d\r\n"
 			"Username: %s\r\n"
 			"Refresh: %d\r\n"
 			"State: %s\r\n"
 			"RegistrationTime: %ld\r\n"
-			"\r\n", iterator->hostname, iterator->portno ? iterator->portno : STANDARD_SIP_PORT,
+			"\r\n", idtext, iterator->hostname, iterator->portno ? iterator->portno : STANDARD_SIP_PORT,
 					  iterator->username, iterator->refresh, regstate2str(iterator->regstate), (long) iterator->regtime.tv_sec);
 		ASTOBJ_UNLOCK(iterator);
 		total++;