Changeset 839

Timestamp:

Dec 1, 2006 11:14:37 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #29: calling pjsua_init() to reinitialize the whole libraries after pjsua_destroy() is called

Location:

pjproject/trunk

Files:

• pjlib/include/pj/errno.h (modified) (1 diff)
• pjlib/src/pj/config.c (modified) (1 diff)
• pjlib/src/pj/errno.c (modified) (1 diff)
• pjlib/src/pj/except.c (modified) (1 diff)
• pjlib/src/pj/os_core_unix.c (modified) (1 diff)
• pjlib/src/pj/os_core_win32.c (modified) (1 diff)
• pjlib/src/pj/pool_buf.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (3 diffs)
• pjsip/src/pjsip/sip_endpoint.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_parser.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transaction.c (modified) (5 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/errno.h

@@ -347 +347 @@
 PJ_END_DECL
 
+/* Internal */
+void pj_errno_clear_handlers(void);
+
 #endif  /* __PJ_ERRNO_H__ */
 

pjproject/trunk/pjlib/src/pj/config.c

@@ -22 +22 @@
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.9";
+const char *PJ_VERSION = "0.5.9.1";
 
 PJ_DEF(void) pj_dump_config(void)

pjproject/trunk/pjlib/src/pj/errno.c

@@ -134 +134 @@
 }
 
+/* Internal PJLIB function called by pj_shutdown() to clear error handlers */
+void pj_errno_clear_handlers(void)
+{
+    err_msg_hnd_cnt = 0;
+    pj_bzero(err_msg_hnd, sizeof(err_msg_hnd));
+}
+
+
 /*
  * pj_strerror()

pjproject/trunk/pjlib/src/pj/except.c

@@ -58 +58 @@
         thread_local_id = -1;
     }
+
+#if defined(PJ_HAS_EXCEPTION_NAMES) && PJ_HAS_EXCEPTION_NAMES != 0
+    {
+        unsigned i;
+        for (i=0; i<PJ_MAX_EXCEPTION_ID; ++i)
+            exception_id_names[i] = NULL;
+    }
+#else
+    last_exception_id = 1;
+#endif
 }
 

pjproject/trunk/pjlib/src/pj/os_core_unix.c

@@ -208 +208 @@
     }
 #endif
+
+    /* Clear static variables */
+    pj_errno_clear_handlers();
 }
 

pjproject/trunk/pjlib/src/pj/os_core_win32.c

@@ -219 +219 @@
     }
 
+    /* Clear static variables */
+    pj_errno_clear_handlers();
+
     /* Shutdown Winsock */
     //WSACleanup();

pjproject/trunk/pjlib/src/pj/pool_buf.c

@@ -39 +39 @@
         tls = -1;
     }
+    if (is_initialized)
+        is_initialized = 0;
 }
 

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -362 +362 @@
 
     /* Run pj_getopt once to see if user specifies config file to read. */ 
+    pj_optind = 0;
     while ((c=pj_getopt_long(argc, argv, "", long_options, 
                              &option_index)) != -1) 
@@ -2846 +2847 @@
 pj_status_t app_destroy(void)
 {
+    pj_status_t status;
+
 #ifdef STEREO_DEMO
     if (app_config.snd) {
@@ -2858 +2861 @@
     }
 
-    return pjsua_destroy();
+    status = pjsua_destroy();
+
+    pj_bzero(&app_config, sizeof(app_config));
+
+    return status;
 }
 

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -109 +109 @@
 /* Defined in sip_parser.c */
 void init_sip_parser(void);
+void deinit_sip_parser(void);
 
 /* Defined in sip_tel_uri.c */
@@ -588 +589 @@
     /* Delete endpoint mutex. */
     pj_mutex_destroy(endpt->mutex);
+
+    /* Deinit parser */
+    deinit_sip_parser();
 
     /* Delete module's mutex */

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -282 +282 @@
 static pj_status_t init_parser()
 {
-    static int initialized;
     pj_status_t status;
-
-    if (initialized)
-        return PJ_SUCCESS;
-
-    initialized = 1;
 
     /*
@@ -473 +467 @@
 void init_sip_parser(void)
 {
-    if (!parser_is_initialized) {
-        if (!parser_is_initialized) {
-            init_parser();
-            parser_is_initialized = 1;
-        }
-    }
+    pj_enter_critical_section();
+    if (++parser_is_initialized == 1) {
+        init_parser();
+    }
+    pj_leave_critical_section();
+}
+
+void deinit_sip_parser(void)
+{
+    pj_enter_critical_section();
+    if (--parser_is_initialized == 0) {
+        /* Clear header handlers */
+        pj_bzero(handler, sizeof(handler));
+        handler_count = 0;
+
+        /* Clear URI handlers */
+        pj_bzero(uri_handler, sizeof(uri_handler));
+        uri_handler_count = 0;
+    }
+    pj_leave_critical_section();
 }
 

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -176 +176 @@
 static pj_status_t tsx_create( pjsip_module *tsx_user,
                                pjsip_transaction **p_tsx);
-static void        tsx_destroy( pjsip_transaction *tsx );
+static pj_status_t tsx_destroy( pjsip_transaction *tsx );
 static void        tsx_resched_retransmission( pjsip_transaction *tsx );
 static pj_status_t tsx_retransmit( pjsip_transaction *tsx, int resched);
@@ -645 +645 @@
         pjsip_transaction *tsx = pj_hash_this(mod_tsx_layer.htable, it);
         pj_hash_iterator_t *next = pj_hash_next(mod_tsx_layer.htable, it);
-        if (tsx)
+        if (tsx) {
+            mod_tsx_layer_unregister_tsx(tsx);
             tsx_destroy(tsx);
+        }
         it = next;
     }
@@ -921 +923 @@
 
 /* Destroy transaction. */
-static void tsx_destroy( pjsip_transaction *tsx )
+static pj_status_t tsx_destroy( pjsip_transaction *tsx )
 {
     struct tsx_lock_data *lck;
@@ -955 +957 @@
         PJ_LOG(4,(tsx->obj_name, "Will destroy later because transport is "
                                  "in progress"));
-        return;
+        return PJ_EBUSY;
     }
 
@@ -972 +974 @@
 
     pjsip_endpt_release_pool(tsx->endpt, tsx->pool);
+
+    return PJ_SUCCESS;
 }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -712 +712 @@
     pj_shutdown();
 
+    /* Clear pjsua_var */
+    pj_bzero(&pjsua_var, sizeof(pjsua_var));
+
     /* Done. */
     return PJ_SUCCESS;