aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-10 12:09:25 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-10 12:09:25 +0000
commit157250a39a1814d5429503dabd85b730ca836a65 (patch)
tree40b295be720c56cdeb5706f31dff63b6b876a1ca
parentbfe59dd5d2c5d0fc249cac872faee0dff69b2112 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@217594 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 65a5300a9..4769e0800 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14103,13 +14103,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++;