Changeset 4360 for pjproject/trunk/pjnath/include/pjnath/stun_session.h

Timestamp:

Feb 21, 2013 11:26:35 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1617: major synchronization fixes in PJNATH with incorporation of group lock to avoid deadlock and crashes due to race conditions

File:

• pjproject/trunk/pjnath/include/pjnath/stun_session.h (modified) (4 diffs)

pjproject/trunk/pjnath/include/pjnath/stun_session.h

@@ -31 +31 @@
 #include <pjnath/stun_transaction.h>
 #include <pj/list.h>
+#include <pj/lock.h>
 #include <pj/timer.h>
 
@@ -385 +386 @@
  * @param cb            Session callback.
  * @param fingerprint   Enable message fingerprint for outgoing messages.
+ * @param grp_lock      Optional group lock to be used by this session.
+ *                      If NULL, the session will create one itself.
  * @param p_sess        Pointer to receive STUN session instance.
  *
@@ -393 +396 @@
                                             const pj_stun_session_cb *cb,
                                             pj_bool_t fingerprint,
+                                            pj_grp_lock_t *grp_lock,
                                             pj_stun_session **p_sess);
 
@@ -430 +434 @@
  */
 PJ_DECL(void*) pj_stun_session_get_user_data(pj_stun_session *sess);
-
-/**
- * Change the lock object used by the STUN session. By default, the STUN
- * session uses a mutex to protect its internal data. If application already
- * protects access to STUN session with higher layer lock, it may disable
- * the mutex protection in the STUN session by changing the STUN session
- * lock to a NULL mutex.
- *
- * @param sess      The STUN session instance.
- * @param lock      New lock instance to be used by the STUN session.
- * @param auto_del  Specify whether STUN session should destroy this
- *                  lock instance when it's destroyed.
- */
-PJ_DECL(pj_status_t) pj_stun_session_set_lock(pj_stun_session *sess,
-                                              pj_lock_t *lock,
-                                              pj_bool_t auto_del);
 
 /**