diff options
Diffstat (limited to 'pjlib/src/pj')
| -rw-r--r-- | pjlib/src/pj/sock_bsd.c | 5 | ||||
| -rw-r--r-- | pjlib/src/pj/ssl_sock_ossl.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c index d6b18990..d73654bb 100644 --- a/pjlib/src/pj/sock_bsd.c +++ b/pjlib/src/pj/sock_bsd.c @@ -228,11 +228,12 @@ PJ_DEF(pj_uint32_t) pj_htonl(pj_uint32_t hostlong) */ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr) { -#if !defined(PJ_LINUX) && !defined(PJ_LINUX_KERNEL) +#if 0 //!defined(PJ_LINUX) && !defined(PJ_LINUX_KERNEL) return inet_ntoa(*(struct in_addr*)&inaddr); #else struct in_addr addr; - addr.s_addr = inaddr.s_addr; + //addr.s_addr = inaddr.s_addr; + pj_memcpy(&addr, &inaddr, sizeof(addr)); return inet_ntoa(addr); #endif } diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index 86a9351a..f8e3a2dd 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -1321,8 +1321,8 @@ static void get_cert_info(pj_pool_t *pool, pj_ssl_cert_info *ci, X509 *x, type = PJ_SSL_CERT_NAME_URI; break; case GEN_IPADD: - p = ASN1_STRING_data(name->d.ip); - len = ASN1_STRING_length(name->d.ip); + p = (unsigned char*)M_ASN1_STRING_data(name->d.ip); + len = M_ASN1_STRING_length(name->d.ip); type = PJ_SSL_CERT_NAME_IP; break; default: |