diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-05 15:23:32 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-05 15:23:32 +0000 |
| commit | 7a3f6422073e86c0b77451bf7e064c4f00c46756 (patch) | |
| tree | 22121d49b2e41eae214dde3c4973021544c35a7f /include | |
| parent | 5403b28778800035e62e5b861712640bbc32058c (diff) | |
Merged revisions 106015 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r106015 | tilghman | 2008-03-05 09:17:16 -0600 (Wed, 05 Mar 2008) | 7 lines
Correctly initialize retransid in SIP, and ensure that the warning when failing to delete a schedule entry can actually hit the log.
(closes issue #12140)
Reported by: slavon
Patches:
sch2.patch uploaded by slavon (license 288)
(Patch slightly modified by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/sched.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index caba02084..cd65a6887 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -38,8 +38,9 @@ extern "C" { #define AST_SCHED_DEL(sched, id) \ do { \ int _count = 0; \ - while (id > -1 && ast_sched_del(sched, id) && _count++ < 10) \ + while (id > -1 && ast_sched_del(sched, id) && ++_count < 10) { \ usleep(1); \ + } \ if (_count == 10) \ ast_log(LOG_WARNING, "Unable to cancel schedule ID %d. This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \ id = -1; \ @@ -48,8 +49,9 @@ extern "C" { #define AST_SCHED_REPLACE_VARIABLE(id, sched, when, callback, data, variable) \ do { \ int _count = 0; \ - while (id > -1 && ast_sched_del(sched, id) && _count++ < 10) \ + while (id > -1 && ast_sched_del(sched, id) && ++_count < 10) { \ usleep(1); \ + } \ if (_count == 10) \ ast_log(LOG_WARNING, "Unable to cancel schedule ID %d. This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \ id = ast_sched_add_variable(sched, when, callback, data, variable); \ |