[Asterisk-cvs] asterisk/channels chan_sip.c,1.510.2.59,1.510.2.60

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv21241/channels

Modified Files:
      Tag: v1-0
	chan_sip.c 
Log Message:
create useful output for time left to expire (bug #4022)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.510.2.59
retrieving revision 1.510.2.60
diff -u -d -r1.510.2.59 -r1.510.2.60
--- chan_sip.c	6 Apr 2005 17:09:03 -0000	1.510.2.59
+++ chan_sip.c	15 Apr 2005 07:24:34 -0000	1.510.2.60
@@ -603,6 +603,7 @@
 {
 	int res;
 	char iabuf[INET_ADDRSTRLEN];
+// ast_log(LOG_WARNING, "__sip_xmit from '%s' to '%s'\n", "", ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr));
 	if (p->nat & SIP_NAT_ROUTE)
 	    res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->recv, sizeof(struct sockaddr_in));
 	else
@@ -5809,7 +5810,7 @@
 		ast_cli(fd, "  Mailbox      : %s\n", peer->mailbox);
 		ast_cli(fd, "  LastMsgsSent : %d\n", peer->lastmsgssent);
 		ast_cli(fd, "  Dynamic      : %s\n", (peer->dynamic?"Yes":"No"));
-		ast_cli(fd, "  Expire       : %d\n", peer->expire);
+		ast_cli(fd, "  Expire       : %ld seconds\n", ast_sched_when(sched,peer->expire));
 		ast_cli(fd, "  Expiry       : %d\n", peer->expiry);
 		ast_cli(fd, "  Insecure     : %s\n", (peer->insecure?((peer->insecure == 2)?"Very":"Yes"):"No") );
 		ast_cli(fd, "  Nat          : %s\n", nat2str(peer->nat));