Changeset 162 for pjproject/trunk/pjsip/src/pjsua/pjsua.h

Timestamp:

Feb 9, 2006 12:13:40 AM (18 years ago)

Author:

bennylp

Message:

Integration of pjmedia and pjsip error subsystem to pjlib

File:

• pjproject/trunk/pjsip/src/pjsua/pjsua.h (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsua/pjsua.h

@@ -39 +39 @@
 
 /* PJSUA application variables. */
-struct pjsua_t
+struct pjsua
 {
     /* Control: */
 
-    pj_caching_pool   cp;           /**< Global pool factory.           */
-    pjsip_endpoint   *endpt;        /**< Global endpoint.               */
-    pj_pool_t        *pool;         /**< pjsua's private pool.          */
-    pjsip_module      mod;          /**< pjsua's PJSIP module.          */
+    pj_caching_pool  cp;            /**< Global pool factory.           */
+    pjsip_endpoint  *endpt;         /**< Global endpoint.               */
+    pj_pool_t       *pool;          /**< pjsua's private pool.          */
+    pjsip_module     mod;           /**< pjsua's PJSIP module.          */
     
+
+    /* Media:  */
+
+    pjmedia_endpt   *med_endpt;    /**< Media endpoint.         */
+    pj_bool_t        null_audio;
+    pjmedia_sock_info med_skinfo;
 
     /* User info: */
@@ -58 +64 @@
     pj_str_t         proxy;
     pj_str_t         outbound_proxy;
+    pjsip_route_hdr  route_set;
+
 
     /* Registration: */
@@ -84 +92 @@
     pj_sock_t        sip_sock;      /**< SIP UDP socket.                */
     pj_sockaddr_in   sip_sock_name; /**< Public/STUN UDP socket addr.   */
-    pj_sock_t        rtp_sock;      /**< RTP socket.                    */
-    pj_sockaddr_in   rtp_sock_name; /**< Public/STUN UDP socket addr.   */
-    pj_sock_t        rtcp_sock;     /**< RTCP socket.                   */
-    pj_sockaddr_in   rtcp_sock_name;/**< Public/STUN UDP socket addr.   */
 
 
@@ -97 +101 @@
     pj_str_t         stun_srv2;
     int              stun_port2;
-
-
-    /* Media stack: */
-
-    pj_bool_t        null_audio;
-    pj_med_mgr_t    *mmgr;
 
 
@@ -114 +112 @@
 };
 
-extern struct pjsua_t pjsua;
+
+/** PJSUA instance. */
+extern struct pjsua pjsua;
+
+
+/** 
+ * Structure to be attached to all dialog. 
+ * Given a dialog "dlg", application can retrieve this structure
+ * by accessing dlg->mod_data[pjsua.mod.id].
+ */
+struct pjsua_inv_data
+{
+    pjmedia_session *session;
+};
+
 
 /*****************************************************************************