aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-19 00:15:28 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-19 00:15:28 +0000
commit5461a9b67df5000d4d03d6b8795ccc8cb0c9e2bf (patch)
tree1651529f3ea77b28eb6aa71f8d2b614fba73e195
parent711e4bcb4c9a4723bc23879a4c8dfca1dffbca00 (diff)
Merged revisions 138778-138780 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r138778 | seanbright | 2008-08-18 20:08:27 -0400 (Mon, 18 Aug 2008) | 1 line While we're at it, make this machine parseable too. ........ r138779 | seanbright | 2008-08-18 20:09:38 -0400 (Mon, 18 Aug 2008) | 1 line And remove code we don't need anymore. ........ r138780 | seanbright | 2008-08-18 20:10:56 -0400 (Mon, 18 Aug 2008) | 1 line Let it compile now, too (woops) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138781 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 04377e5c4..eaed0bc40 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12005,9 +12005,7 @@ static int manager_show_registry(struct mansession *s, const struct message *m)
{
const char *id = astman_get_header(m, "ActionID");
char idtext[256] = "";
- char tmpdat[256] = "";
int total = 0;
- struct ast_tm tm;
if (!ast_strlen_zero(id))
snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
@@ -12016,11 +12014,6 @@ static int manager_show_registry(struct mansession *s, const struct message *m)
ASTOBJ_CONTAINER_TRAVERSE(&regl, 1, do {
ASTOBJ_RDLOCK(iterator);
- if (iterator->regtime.tv_sec) {
- ast_localtime(&iterator->regtime, &tm, NULL);
- ast_strftime(tmpdat, sizeof(tmpdat), "%a, %d %b %Y %T", &tm);
- } else
- tmpdat[0] = '\0';
astman_append(s,
"Event: RegistryEntry\r\n"
"Host: %s\r\n"
@@ -12028,9 +12021,9 @@ static int manager_show_registry(struct mansession *s, const struct message *m)
"Username: %s\r\n"
"Refresh: %d\r\n"
"State: %s\r\n"
- "RegistrationTime: %s\r\n"
+ "RegistrationTime: %ld\r\n"
"\r\n", iterator->hostname, iterator->portno ? iterator->portno : STANDARD_SIP_PORT,
- iterator->username, iterator->refresh, regstate2str(iterator->regstate), tmpdat);
+ iterator->username, iterator->refresh, regstate2str(iterator->regstate), (long) iterator->regtime.tv_sec);
ASTOBJ_UNLOCK(iterator);
total++;
} while(0));