[svn-commits] may: trunk r371059 - /trunk/addons/ooh323c/src/ooTimer.c

[SVN commits to the Digium repositories]

Author: may
Date: Fri Aug 10 09:45:33 2012
New Revision: 371059

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371059
Log:
restore calling cb functions by timer expire
this was broken in rev 369602

Modified:
    trunk/addons/ooh323c/src/ooTimer.c

Modified: trunk/addons/ooh323c/src/ooTimer.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooTimer.c?view=diff&rev=371059&r1=371058&r2=371059
==============================================================================
--- trunk/addons/ooh323c/src/ooTimer.c (original)
+++ trunk/addons/ooh323c/src/ooTimer.c Fri Aug 10 09:45:33 2012
@@ -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 @@
 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 @@
           */
          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)