diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-03-11 21:38:05 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-03-11 21:38:05 +0000 |
| commit | 4e1d5dc0d96e099f12ea0127434b4f7029e95b2b (patch) | |
| tree | 8471f75aefe77e864a4c9216f29ad04f2c8bf945 /pjsip-apps | |
| parent | cedeaec6e1f22463dc1e13e3dee467fc4dcd4019 (diff) | |
Ticket #479: allow media transport framework to return transport specific info (for example, to know whether SRTP is enabled)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1860 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/samples/simpleua.c | 9 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/siprtp.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pjsip-apps/src/samples/simpleua.c b/pjsip-apps/src/samples/simpleua.c index 313deee9..634bc539 100644 --- a/pjsip-apps/src/samples/simpleua.c +++ b/pjsip-apps/src/samples/simpleua.c @@ -81,7 +81,7 @@ static pjsip_endpoint *g_endpt; /* SIP endpoint. */ static pj_caching_pool cp; /* Global pool factory. */ static pjmedia_endpt *g_med_endpt; /* Media endpoint. */ -static pjmedia_sock_info g_med_skinfo; /* Socket info for media */ +static pjmedia_transport_info g_med_tpinfo; /* Socket info for media */ static pjmedia_transport *g_med_transport;/* Media stream transport */ /* Call variables: */ @@ -301,7 +301,7 @@ int main(int argc, char *argv[]) * need this info to create SDP (i.e. the address and port info in * the SDP). */ - pjmedia_transport_get_info(g_med_transport, &g_med_skinfo); + pjmedia_transport_get_info(g_med_transport, &g_med_tpinfo); /* @@ -364,7 +364,8 @@ int main(int argc, char *argv[]) status = pjmedia_endpt_create_sdp( g_med_endpt, /* the media endpt */ dlg->pool, /* pool. */ 1, /* # of streams */ - &g_med_skinfo, /* RTP sock info */ + &g_med_tpinfo.sock_info, + /* RTP sock info */ &local_sdp); /* the SDP result */ PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); @@ -571,7 +572,7 @@ static pj_bool_t on_rx_request( pjsip_rx_data *rdata ) */ status = pjmedia_endpt_create_sdp( g_med_endpt, rdata->tp_info.pool, 1, - &g_med_skinfo, + &g_med_tpinfo.sock_info, &local_sdp); PJ_ASSERT_RETURN(status == PJ_SUCCESS, PJ_TRUE); diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 5f0a3379..53abcdee 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -1005,7 +1005,7 @@ static pj_status_t create_sdp( pj_pool_t *pool, pjmedia_sdp_session *sdp; pjmedia_sdp_media *m; pjmedia_sdp_attr *attr; - pjmedia_sock_info tpinfo; + pjmedia_transport_info tpinfo; struct media_stream *audio = &call->media[0]; PJ_ASSERT_RETURN(pool && p_sdp, PJ_EINVAL); @@ -1047,7 +1047,7 @@ static pj_status_t create_sdp( pj_pool_t *pool, /* Standard media info: */ m->desc.media = pj_str("audio"); - m->desc.port = pj_ntohs(tpinfo.rtp_addr_name.ipv4.sin_port); + m->desc.port = pj_ntohs(tpinfo.sock_info.rtp_addr_name.ipv4.sin_port); m->desc.port_count = 1; m->desc.transport = pj_str("RTP/AVP"); |