Changeset 2893

Timestamp:

Aug 17, 2009 3:56:18 PM (15 years ago)

Author:

nanang

Message:

Ticket #833: Fixed bug session timer won't work properly after pjsua-lib restarted, by adding deinit module function for session timer and register the deinit function into atexit.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

@@ -476 +476 @@
 }
 
+/* Deinitialize Session Timers */
+static void pjsip_timer_deinit_module(void)
+{
+    is_initialized = PJ_FALSE;
+}
+
 /*
  * Initialize Session Timers support in PJSIP. 
@@ -505 +511 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    /* Register deinit module to be executed when PJLIB shutdown */
+    if (pj_atexit(&pjsip_timer_deinit_module) != PJ_SUCCESS) {
+        /* Failure to register this function may cause this module won't 
+         * work properly when the stack is restarted (without quitting 
+         * application).
+         */
+        pj_assert(!"Failed to register Session Timer deinit.");
+        PJ_LOG(1, (THIS_FILE, "Failed to register Session Timer deinit."));
+    }
 
     is_initialized = PJ_TRUE;
@@ -993 +1009 @@
     return PJ_SUCCESS;
 }
-