[asterisk-commits] rizzo: branch rizzo/astobj2 r75736 - /team/rizzo/astobj2/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Wed Jul 18 15:18:40 2007
New Revision: 75736

URL: http://svn.digium.com/view/asterisk?view=rev&rev=75736
Log:
adapt to the changes in trunk


Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=75736&r1=75735&r2=75736
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Wed Jul 18 15:18:40 2007
@@ -1341,7 +1341,7 @@
 	int refresh;			/*!< How often to refresh */
 	struct sip_pvt *register_pvt;		/*!< create a sip_pvt structure for each outbound "registration dialog" in progress */
 	enum sipregistrystate regstate;	/*!< Registration state (see above) */
-	time_t regtime;			/*!< Last successful registration time */
+	struct timeval regtime;			/*!< Last successful registration time */
 	int callid_valid;		/*!< 0 means we haven't chosen callid for this registry yet. */
 	unsigned int ocseq;		/*!< Sequence number we got to for REGISTERs for this registry */
 	struct sockaddr_in us;		/*!< Who the server thinks we are */
@@ -11456,7 +11456,7 @@
 #define FORMAT  "%-30.30s  %-12.12s  %8d %-20.20s %-25.25s\n"
 	char host[80];
 	char tmpdat[256];
-	struct tm tm;
+	struct ast_tm tm;
 	int counter = 0;
 
 	if (argc != 3)
@@ -11465,9 +11465,9 @@
 	ASTOBJ_CONTAINER_TRAVERSE(&regl, 1, do {
 		ASTOBJ_RDLOCK(iterator);
 		snprintf(host, sizeof(host), "%s:%d", iterator->hostname, iterator->portno ? iterator->portno : STANDARD_SIP_PORT);
-		if (iterator->regtime) {
+		if (iterator->regtime.tv_sec) {
 			ast_localtime(&iterator->regtime, &tm, NULL);
-			strftime(tmpdat, sizeof(tmpdat), "%a, %d %b %Y %T", &tm);
+			ast_strftime(tmpdat, sizeof(tmpdat), "%a, %d %b %Y %T", &tm);
 		} else {
 			tmpdat[0] = 0;
 		}
@@ -13449,7 +13449,7 @@
 
 	case 200:	/* 200 OK */
 		r->regstate = REG_STATE_REGISTERED;
-		r->regtime = time(NULL);		/* Reset time of last succesful registration */
+		r->regtime = ast_tvnow();		/* Reset time of last succesful registration */
 		manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelType: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate));
 		r->regattempts = 0;
 		if (option_debug)