diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-03-26 13:25:07 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-03-26 13:25:07 +0000 |
| commit | 63bbc72f8536347656ac59dea7fb9576c82ac55d (patch) | |
| tree | 4a8b7fbb7b357b82cdeb49c44672439843155785 /pjmedia | |
| parent | 84b0defcf6903a8b014ab1ba38d8923282f230ed (diff) | |
ICE: implement RTCP component and cancelling check in progress
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1106 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/transport_ice.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia/transport_ice.c b/pjmedia/src/pjmedia/transport_ice.c index 445f3732..3397e3e1 100644 --- a/pjmedia/src/pjmedia/transport_ice.c +++ b/pjmedia/src/pjmedia/transport_ice.c @@ -153,20 +153,19 @@ PJ_DEF(pj_status_t) pjmedia_ice_start_init( pjmedia_transport *tp, const pj_sockaddr_in *turn_srv) { struct transport_ice *tp_ice = (struct transport_ice*)tp; - unsigned comp_id; pj_status_t status; status = pj_ice_st_set_stun_srv(tp_ice->ice_st, stun_srv, turn_srv); if (status != PJ_SUCCESS) return status; - status = pj_ice_st_create_comp(tp_ice->ice_st, 1, options, start_addr, - &comp_id); + status = pj_ice_st_create_comp(tp_ice->ice_st, 1, options, start_addr); if (status != PJ_SUCCESS) return status; if (tp_ice->ice_st->comp_cnt > 1) { pj_sockaddr_in addr; + pj_uint16_t port; pj_memcpy(&addr, &tp_ice->ice_st->comp[0]->local_addr.ipv4, sizeof(pj_sockaddr_in)); @@ -175,9 +174,10 @@ PJ_DEF(pj_status_t) pjmedia_ice_start_init( pjmedia_transport *tp, else addr.sin_addr.s_addr = 0; - addr.sin_port = (pj_uint16_t)(pj_ntohs(addr.sin_port)+1); - status = pj_ice_st_create_comp(tp_ice->ice_st, 2, options, - &addr, &comp_id); + port = pj_ntohs(addr.sin_port); + ++port; + addr.sin_port = pj_htons(port); + status = pj_ice_st_create_comp(tp_ice->ice_st, 2, options, &addr); if (status != PJ_SUCCESS) return status; } @@ -481,7 +481,7 @@ static pj_status_t tp_get_info(pjmedia_transport *tp, comp = ice_st->comp[1]; pj_assert(comp->default_cand >= 0); info->rtp_sock = comp->sock; - pj_memcpy(&info->rtp_addr_name, + pj_memcpy(&info->rtcp_addr_name, &comp->cand_list[comp->default_cand].addr, sizeof(pj_sockaddr_in)); } |