diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-12-03 00:40:58 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-12-03 00:40:58 +0000 |
| commit | 66573305157f00a1440ada3f71e7fd471f99715b (patch) | |
| tree | 475e9b9cae776e5ba38e562168cec6289fed049f /pjsip/src | |
| parent | 085b6a1482c3241345b79c3f29ad9f4d64f4805f (diff) | |
Fixed compilation errors/warnings on Linux with the recent IPv6 commits
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1611 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src')
| -rw-r--r-- | pjsip/src/pjsip/sip_transport.c | 21 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_tls_ossl.c | 6 |
2 files changed, 12 insertions, 15 deletions
diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c index f524e557..9ced7988 100644 --- a/pjsip/src/pjsip/sip_transport.c +++ b/pjsip/src/pjsip/sip_transport.c @@ -38,6 +38,15 @@ #if 0 # define TRACE_(x) PJ_LOG(5,x) + +static const char *addr_string(const pj_sockaddr_t *addr) +{ + static char str[PJ_INET6_ADDRSTRLEN]; + pj_inet_ntop(((const pj_sockaddr*)addr)->addr.sa_family, + pj_sockaddr_get_addr(addr), + str, sizeof(str)); + return str; +} #else # define TRACE_(x) #endif @@ -178,18 +187,6 @@ struct transport_names_t *get_tpname(pjsip_transport_type_e type) } -/* - * Tools to get address string. - */ -static const char *addr_string(const pj_sockaddr_t *addr) -{ - static char str[PJ_INET6_ADDRSTRLEN]; - pj_inet_ntop(((const pj_sockaddr*)addr)->addr.sa_family, - pj_sockaddr_get_addr(addr), - str, sizeof(str)); - return str; -} - /* * Register new transport type to PJSIP. diff --git a/pjsip/src/pjsip/sip_transport_tls_ossl.c b/pjsip/src/pjsip/sip_transport_tls_ossl.c index e1c11a86..a7d7d73c 100644 --- a/pjsip/src/pjsip/sip_transport_tls_ossl.c +++ b/pjsip/src/pjsip/sip_transport_tls_ossl.c @@ -991,13 +991,13 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start( pjsip_endpoint *endpt, * interface address as the transport's address. */ if (listener_addr->sin_addr.s_addr == 0) { - pj_in_addr hostip; + pj_sockaddr hostip; - status = pj_gethostip(&hostip); + status = pj_gethostip(pj_AF_INET(), &hostip); if (status != PJ_SUCCESS) goto on_error; - listener_addr->sin_addr = hostip; + listener_addr->sin_addr = hostip.ipv4.sin_addr; } /* Save the address name */ |