diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-12-01 09:04:24 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-12-01 09:04:24 +0000 |
| commit | 7dfeb3577e483d8b9d9a9c6306ecf8f53060d103 (patch) | |
| tree | 393c58c6b26b05fe216556ee2dcb2c56353f5bf7 /pjnath | |
| parent | ef6e3e90831cec1edf8b1c9b042f7f5edaa4bb97 (diff) | |
Related to ticket #415: modification in pjlib API to support IPv6
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1604 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/src/pjnath/ice_strans.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c index 8ec13a95..a37fff12 100644 --- a/pjnath/src/pjnath/ice_strans.c +++ b/pjnath/src/pjnath/ice_strans.c @@ -346,19 +346,19 @@ static pj_status_t create_component(pj_ice_strans *ice_st, { /* Socket is bound to INADDR_ANY */ unsigned i, ifs_cnt; - pj_in_addr ifs[PJ_ICE_ST_MAX_CAND-2]; + pj_sockaddr ifs[PJ_ICE_ST_MAX_CAND-2]; /* Reset default candidate */ comp->default_cand = -1; /* Enum all IP interfaces in the host */ ifs_cnt = PJ_ARRAY_SIZE(ifs); - status = pj_enum_ip_interface(&ifs_cnt, ifs); + status = pj_enum_ip_interface(pj_AF_INET(), &ifs_cnt, ifs); if (status != PJ_SUCCESS) goto on_error; /* Set default IP interface as the base address */ - status = pj_gethostip(&comp->local_addr.ipv4.sin_addr); + status = pj_gethostip(pj_AF_INET(), &comp->local_addr); if (status != PJ_SUCCESS) goto on_error; @@ -369,17 +369,17 @@ static pj_status_t create_component(pj_ice_strans *ice_st, pj_uint16_t local_pref; /* Ignore 127.0.0.0/24 address */ - if ((pj_ntohl(ifs[i].s_addr) >> 24)==127) + if ((pj_ntohl(ifs[i].ipv4.sin_addr.s_addr) >> 24)==127) continue; pj_memcpy(&cand_addr, &comp->local_addr, sizeof(pj_sockaddr_in)); - cand_addr.sin_addr.s_addr = ifs[i].s_addr; + cand_addr.sin_addr.s_addr = ifs[i].ipv4.sin_addr.s_addr; /* If the IP address is equal to local address, assign it * as default candidate. */ - if (ifs[i].s_addr == comp->local_addr.ipv4.sin_addr.s_addr) { + if (ifs[i].ipv4.sin_addr.s_addr == comp->local_addr.ipv4.sin_addr.s_addr) { set_default = PJ_TRUE; local_pref = 65535; } else { @@ -412,7 +412,7 @@ static pj_status_t create_component(pj_ice_strans *ice_st, * in case its value is zero. */ if (comp->local_addr.ipv4.sin_addr.s_addr == 0) { - status = pj_gethostip(&comp->local_addr.ipv4.sin_addr); + status = pj_gethostip(pj_AF_INET(), &comp->local_addr); if (status != PJ_SUCCESS) return status; } |