Changeset 1998

Timestamp:

Jun 9, 2008 9:35:59 AM (16 years ago)

Author:

nanang

Message:

Added more validations & a new API (thanks Florian Bomers):

• added more validation on pjmedia transport get info.
• added more validation on stop_media_session() of pjsua_media, useful when conference is not used.
• added new API for retrieving user_data of pjmedia session.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/session.h (modified) (1 diff)
• pjmedia/include/pjmedia/transport.h (modified) (1 diff)
• pjmedia/src/pjmedia/session.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/session.h

@@ -173 +173 @@
                                                pjmedia_session_info *info );
 
+/**
+ * Get user data of the session.
+ *
+ * @param session       The session being queried.
+ *
+ * @return              User data of the session.
+ */
+PJ_DECL(void*) pjmedia_session_get_user_data( pjmedia_session *session);
+
 
 /**

pjproject/trunk/pjmedia/include/pjmedia/transport.h

@@ -497 +497 @@
                                                   pjmedia_transport_info *info)
 {
-    if (tp->op->get_info)
+    if (tp && tp->op && tp->op->get_info)
         return (*tp->op->get_info)(tp, info);
     else

pjproject/trunk/pjmedia/src/pjmedia/session.c

@@ -686 +686 @@
 }
 
+/*
+ * Get user data.
+ */
+PJ_DEF(void*) pjmedia_session_get_user_data( pjmedia_session *session)
+{
+    return (session? session->user_data : NULL);
+}
 
 /**

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

@@ -954 +954 @@
 
     if (call->conf_slot != PJSUA_INVALID_ID) {
-        pjmedia_conf_remove_port(pjsua_var.mconf, call->conf_slot);
+        if (pjsua_var.mconf) {
+            pjmedia_conf_remove_port(pjsua_var.mconf, call->conf_slot);
+        }
         call->conf_slot = PJSUA_INVALID_ID;
     }