kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

create useful output for time left to expire (bug #4022)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-04-15 07:24:34 +00:00
parent 1e70fa09cd
commit e16718bb2e
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
channels/chan_sip.c
View File

@@ -603,6 +603,7 @@ static int __sip_xmit(struct sip_pvt *p, char *data, int len)
{ {
int res; int res;
char iabuf[INET_ADDRSTRLEN]; 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) if (p->nat & SIP_NAT_ROUTE)
res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->recv, sizeof(struct sockaddr_in)); res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->recv, sizeof(struct sockaddr_in));
else else
@@ -5809,7 +5810,7 @@ static int sip_show_peer(int fd, int argc, char *argv[])
ast_cli(fd, " Mailbox : %s\n", peer->mailbox); ast_cli(fd, " Mailbox : %s\n", peer->mailbox);
ast_cli(fd, " LastMsgsSent : %d\n", peer->lastmsgssent); ast_cli(fd, " LastMsgsSent : %d\n", peer->lastmsgssent);
ast_cli(fd, " Dynamic : %s\n", (peer->dynamic?"Yes":"No")); 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, " Expiry : %d\n", peer->expiry);
ast_cli(fd, " Insecure : %s\n", (peer->insecure?((peer->insecure == 2)?"Very":"Yes"):"No") ); ast_cli(fd, " Insecure : %s\n", (peer->insecure?((peer->insecure == 2)?"Very":"Yes"):"No") );
ast_cli(fd, " Nat : %s\n", nat2str(peer->nat)); ast_cli(fd, " Nat : %s\n", nat2str(peer->nat));

8
include/asterisk/sched.h
View File

@@ -102,6 +102,14 @@ extern int ast_sched_runq(struct sched_context *con);
*/ */
extern void ast_sched_dump(struct sched_context *con); extern void ast_sched_dump(struct sched_context *con);
/*!Returns the number of seconds before an event takes place */
/*!
* \param con Context to use
* \param id Id to dump
*/
extern long ast_sched_when(struct sched_context *con,int id);
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
} }
#endif #endif

25
sched.c
View File

@@ -399,3 +399,28 @@ int ast_sched_runq(struct sched_context *con)
ast_mutex_unlock(&con->lock); ast_mutex_unlock(&con->lock);
return x; return x;
} }
long ast_sched_when(struct sched_context *con,int id)
{
struct sched *s;
long secs;
struct timeval now;
DEBUG(ast_log(LOG_DEBUG, "ast_sched_when()\n"));
ast_mutex_lock(&con->lock);
s=con->schedq;
while (s!=NULL) {
if (s->id==id) break;
s=s->next;
}
secs=-1;
if (s!=NULL) {
if (gettimeofday(&now, NULL)) {
ast_log(LOG_NOTICE, "gettimeofday() failed!\n");
} else {
secs=s->when.tv_sec-now.tv_sec;
}
}
ast_mutex_unlock(&con->lock);
return secs;
}