Changeset 5801 for pjproject/trunk/pjsip/src/pjsua2/account.cpp

Timestamp:

May 31, 2018 9:58:00 AM (6 years ago)

Author:

nanang

Message:

Fix #2117: Add PJSUA2 API Account::shutdown() to avoid race condition between Account derived class destructor and onRegState callback.

File:

• pjproject/trunk/pjsip/src/pjsua2/account.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua2/account.cpp

@@ -820 +820 @@
      * PJSUA library.
      */
+    shutdown();
+}
+
+void Account::create(const AccountConfig &acc_cfg,
+                     bool make_default) throw(Error)
+{
+    pjsua_acc_config pj_acc_cfg;
+    
+    acc_cfg.toPj(pj_acc_cfg);
+    pj_acc_cfg.user_data = (void*)this;
+    PJSUA2_CHECK_EXPR( pjsua_acc_add(&pj_acc_cfg, make_default, &id) );
+}
+
+void Account::shutdown()
+{
     if (isValid() && pjsua_get_state() < PJSUA_STATE_CLOSING) {
         // Cleanup buddies in the buddy list
@@ -835 +850 @@
 }
 
-void Account::create(const AccountConfig &acc_cfg,
-                     bool make_default) throw(Error)
-{
-    pjsua_acc_config pj_acc_cfg;
-    
-    acc_cfg.toPj(pj_acc_cfg);
-    pj_acc_cfg.user_data = (void*)this;
-    PJSUA2_CHECK_EXPR( pjsua_acc_add(&pj_acc_cfg, make_default, &id) );
-}
-
 void Account::modify(const AccountConfig &acc_cfg) throw(Error)
 {