[asterisk-commits] seanbright: branch 1.6.1 r138782 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon Aug 18 19:17:11 2008
New Revision: 138782

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138782
Log:
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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Aug 18 19:17:11 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409,138412,138442,138473,138476,138479,138482,138518,138631,138687,138694,138775
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409,138412,138442,138473,138476,138479,138482,138518,138631,138687,138694,138775,138778-138780

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=138782&r1=138781&r2=138782
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Mon Aug 18 19:17:11 2008
@@ -12268,9 +12268,7 @@
 {
 	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);
@@ -12279,11 +12277,6 @@
 
 	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"
@@ -12291,9 +12284,9 @@
 			"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));