Changeset 2894

Timestamp:

Aug 17, 2009 3:59:21 PM (15 years ago)

Author:

nanang

Message:

Ticket #948: Fixed bug Replaces extension stops functioning after the library is restarted, by adding deinit module function and register it into atexit.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_replaces.c (modified) (5 diffs)

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

@@ -28 +28 @@
 #include <pjsip/sip_util.h>
 #include <pj/assert.h>
+#include <pj/log.h>
 #include <pj/pool.h>
 #include <pj/string.h>
+
+#define THIS_FILE               "sip_replaces.c"
 
 
@@ -51 +54 @@
 /* Globals */
 static pjsip_endpoint *the_endpt;
+static pj_bool_t is_initialized;
 
 PJ_DEF(pjsip_replaces_hdr*) pjsip_replaces_hdr_create(pj_pool_t *pool)
@@ -157 +161 @@
 }
 
+
+/* Deinitialize Replaces */
+static void pjsip_replaces_deinit_module(void)
+{
+    is_initialized = PJ_FALSE;
+}
+
 /*
  * Initialize Replaces support in PJSIP. 
@@ -164 +175 @@
     pj_status_t status;
     const pj_str_t STR_REPLACES = { "replaces", 8 };
-    static pj_bool_t is_initialized;
 
     the_endpt = endpt;
@@ -180 +190 @@
     status = pjsip_endpt_add_capability(endpt, NULL, PJSIP_H_SUPPORTED, NULL,
                                         1, &STR_REPLACES);
+
+    /* Register deinit module to be executed when PJLIB shutdown */
+    if (pj_atexit(&pjsip_replaces_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 Replaces deinit.");
+        PJ_LOG(1, (THIS_FILE, "Failed to register Replaces deinit."));
+    }
 
     is_initialized = PJ_TRUE;