diff options
| author | Alexandr Anikin <may@telecom-service.ru> | 2012-08-10 14:45:33 +0000 |
|---|---|---|
| committer | Alexandr Anikin <may@telecom-service.ru> | 2012-08-10 14:45:33 +0000 |
| commit | c7b2858322f3e316c010290e8316a4de77a8fa48 (patch) | |
| tree | 2f8752755a5739a8ca3c8b2a321119d173817239 /addons/ooh323c/src | |
| parent | ca481359b9146145f07cca09e1fed7204404bb2b (diff) | |
restore calling cb functions by timer expire
this was broken in rev 369602
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons/ooh323c/src')
| -rw-r--r-- | addons/ooh323c/src/ooTimer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/addons/ooh323c/src/ooTimer.c b/addons/ooh323c/src/ooTimer.c index 56d76f3af..a15421ad2 100644 --- a/addons/ooh323c/src/ooTimer.c +++ b/addons/ooh323c/src/ooTimer.c @@ -17,6 +17,7 @@ #include "asterisk.h" #include "asterisk/lock.h" +#include "ootypes.h" #include "ooDateTime.h" #include "ooTimer.h" #include "ootrace.h" @@ -101,6 +102,7 @@ OOBOOL ooTimerExpired (OOTimer* pTimer) void ooTimerFireExpired (OOCTXT* pctxt, DList *pList) { OOTimer* pTimer; + int ret = OO_OK; while (pList->count > 0) { pTimer = (OOTimer*) pList->head->data; @@ -112,12 +114,16 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList) */ if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer); + ret = (*pTimer->timeoutCB)(pTimer->cbData); + if (!pTimer->reRegister) { ooTimerDelete (pctxt, pList, pTimer); } } else break; } + + return (void)ret; } int ooTimerInsertEntry (OOCTXT* pctxt, DList *pList, OOTimer* pTimer) |