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 7dccd95bda8483bcd70cfb1d2462ed0fe7e7ed3e..5fda830ce25c612bfe42aea56cc9723acc43931a 100644 (file)
--- 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++;