diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-02-09 00:13:40 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-02-09 00:13:40 +0000 |
| commit | 1a7571f62112ae25317663cba5df39c8ff1690c7 (patch) | |
| tree | 4bb56c9bc0d9a941ef274a2545c83a5243821465 /pjsip/src/pjsua/pjsua.h | |
| parent | 86871987528c71dfa0e666e663ed66f5eb776342 (diff) | |
Integration of pjmedia and pjsip error subsystem to pjlib
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@162 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua/pjsua.h')
| -rw-r--r-- | pjsip/src/pjsua/pjsua.h | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/pjsip/src/pjsua/pjsua.h b/pjsip/src/pjsua/pjsua.h index 53b46e58..37740c3a 100644 --- a/pjsip/src/pjsua/pjsua.h +++ b/pjsip/src/pjsua/pjsua.h @@ -38,16 +38,22 @@ PJ_BEGIN_DECL /* 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: */ pj_str_t local_uri; /**< Uri in From: header. */ @@ -57,6 +63,8 @@ struct pjsua_t pj_str_t proxy; pj_str_t outbound_proxy; + pjsip_route_hdr route_set; + /* Registration: */ @@ -83,10 +91,6 @@ struct pjsua_t pj_uint16_t sip_port; /**< SIP signaling port. */ 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. */ @@ -98,12 +102,6 @@ struct pjsua_t int stun_port2; - /* Media stack: */ - - pj_bool_t null_audio; - pj_med_mgr_t *mmgr; - - /* Misc: */ int log_level; /**< Logging verbosity. */ @@ -113,7 +111,21 @@ struct pjsua_t }; -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; +}; + /***************************************************************************** * PJSUA API. |