kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 51172 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51172 | file | 2007-01-16 19:46:29 -0500 (Tue, 16 Jan 2007) | 2 lines

Move rescheduling of lagrq/pings into the scheduler callback.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-17 00:50:59 +00:00
parent 9ca780a271
commit 31224a6b52
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
channels/chan_iax2.c
View File

@@ -962,26 +962,25 @@ static int __schedule_action(void (*func)(void *data), void *data, const char *f
#define schedule_action(func, data) __schedule_action(func, data, __PRETTY_FUNCTION__) #define schedule_action(func, data) __schedule_action(func, data, __PRETTY_FUNCTION__)
#endif #endif
static int send_ping(void *data);
static void __send_ping(void *data) static void __send_ping(void *data)
{ {
int callno = (long)data; int callno = (long)data;
ast_mutex_lock(&iaxsl[callno]); ast_mutex_lock(&iaxsl[callno]);
if (iaxs[callno]) if (iaxs[callno] && iaxs[callno]->pingid != -1) {
send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_PING, 0, NULL, 0, -1); send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_PING, 0, NULL, 0, -1);
iaxs[callno]->pingid = ast_sched_add(sched, ping_time * 1000, send_ping, data);
}
ast_mutex_unlock(&iaxsl[callno]); ast_mutex_unlock(&iaxsl[callno]);
} }
static int send_ping(void *data) static int send_ping(void *data)
{ {
int callno = (long)data;
if (iaxs[callno]) {
#ifdef SCHED_MULTITHREADED #ifdef SCHED_MULTITHREADED
if (schedule_action(__send_ping, data)) if (schedule_action(__send_ping, data))
#endif #endif
__send_ping(data); __send_ping(data);
return 1;
} else
return 0;
return 0; return 0;
} }
@@ -997,27 +996,26 @@ static int get_encrypt_methods(const char *s)
return e; return e;
} }
static int send_lagrq(void *data);
static void __send_lagrq(void *data) static void __send_lagrq(void *data)
{ {
int callno = (long)data; int callno = (long)data;
/* Ping only if it's real not if it's bridged */ /* Ping only if it's real not if it's bridged */
ast_mutex_lock(&iaxsl[callno]); ast_mutex_lock(&iaxsl[callno]);
if (iaxs[callno]) if (iaxs[callno] && iaxs[callno]->lagid != -1) {
send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_LAGRQ, 0, NULL, 0, -1); send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_LAGRQ, 0, NULL, 0, -1);
iaxs[callno]->lagid = ast_sched_add(sched, lagrq_time * 1000, send_lagrq, data);
}
ast_mutex_unlock(&iaxsl[callno]); ast_mutex_unlock(&iaxsl[callno]);
} }
static int send_lagrq(void *data) static int send_lagrq(void *data)
{ {
int callno = (long)data;
if (iaxs[callno]) {
#ifdef SCHED_MULTITHREADED #ifdef SCHED_MULTITHREADED
if (schedule_action(__send_lagrq, data)) if (schedule_action(__send_lagrq, data))
#endif #endif
__send_lagrq(data); __send_lagrq(data);
return 1;
} else
return 0;
return 0; return 0;
} }