From d24a9aee403d6540ec792d3b56a1934fbc0969d4 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Fri, 20 Jul 2007 08:08:30 +0000 Subject: Ticket #354: build PJLIB as dynamic libraries (.DSO) in Symbian git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1405 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/src/pjsip/sip_transport.c | 6 +++--- pjsip/src/pjsip/sip_transport_loop.c | 2 +- pjsip/src/pjsip/sip_transport_tcp.c | 7 ++++--- pjsip/src/pjsip/sip_transport_tls_ossl.c | 6 +++--- pjsip/src/pjsip/sip_transport_udp.c | 8 ++++---- pjsip/src/pjsua-lib/pjsua_core.c | 4 ++-- pjsip/src/pjsua-lib/pjsua_media.c | 4 ++-- pjsip/src/test-pjsip/dns_test.c | 2 +- 8 files changed, 20 insertions(+), 19 deletions(-) (limited to 'pjsip') diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c index 2305b53f..8f5dabb1 100644 --- a/pjsip/src/pjsip/sip_transport.c +++ b/pjsip/src/pjsip/sip_transport.c @@ -560,7 +560,7 @@ PJ_DEF(pj_status_t) pjsip_transport_send( pjsip_transport *tr, tdata->tp_info.transport = tr; pj_memcpy(&tdata->tp_info.dst_addr, addr, addr_len); tdata->tp_info.dst_addr_len = addr_len; - if (((pj_sockaddr*)addr)->addr.sa_family == PJ_AF_INET) { + if (((pj_sockaddr*)addr)->addr.sa_family == pj_AF_INET()) { const char *str_addr; str_addr = pj_inet_ntoa(((pj_sockaddr_in*)addr)->sin_addr); pj_ansi_strcpy(tdata->tp_info.dst_name, str_addr); @@ -1471,12 +1471,12 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport(pjsip_tpmgr *mgr, /* For datagram INET transports, try lookup with zero address. */ else if ((flag & PJSIP_TRANSPORT_DATAGRAM) && - (remote_addr->addr.sa_family == PJ_AF_INET)) + (remote_addr->addr.sa_family == pj_AF_INET())) { pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.rem_addr; pj_bzero(addr, sizeof(pj_sockaddr_in)); - addr->sin_family = PJ_AF_INET; + addr->sin_family = pj_AF_INET(); key_len = sizeof(key.type) + sizeof(pj_sockaddr_in); transport = (pjsip_transport*) diff --git a/pjsip/src/pjsip/sip_transport_loop.c b/pjsip/src/pjsip/sip_transport_loop.c index 45895d96..6e0e3c68 100644 --- a/pjsip/src/pjsip/sip_transport_loop.c +++ b/pjsip/src/pjsip/sip_transport_loop.c @@ -367,7 +367,7 @@ PJ_DEF(pj_status_t) pjsip_loop_start( pjsip_endpoint *endpt, if (status != PJ_SUCCESS) goto on_error; loop->base.key.type = PJSIP_TRANSPORT_LOOP_DGRAM; - //loop->base.key.rem_addr.sa_family = PJ_AF_INET; + //loop->base.key.rem_addr.sa_family = pj_AF_INET(); loop->base.type_name = "LOOP-DGRAM"; loop->base.info = "LOOP-DGRAM"; loop->base.flag = PJSIP_TRANSPORT_DATAGRAM; diff --git a/pjsip/src/pjsip/sip_transport_tcp.c b/pjsip/src/pjsip/sip_transport_tcp.c index 40ec04bd..585dad1f 100644 --- a/pjsip/src/pjsip/sip_transport_tcp.c +++ b/pjsip/src/pjsip/sip_transport_tcp.c @@ -239,7 +239,8 @@ PJ_DEF(pj_status_t) pjsip_tcp_transport_start2(pjsip_endpoint *endpt, /* Create and bind socket */ - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_STREAM, 0, &listener->sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, + &listener->sock); if (status != PJ_SUCCESS) goto on_error; @@ -787,7 +788,7 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory, addr_len && p_transport, PJ_EINVAL); /* Check that address is a sockaddr_in */ - PJ_ASSERT_RETURN(rem_addr->addr.sa_family == PJ_AF_INET && + PJ_ASSERT_RETURN(rem_addr->addr.sa_family == pj_AF_INET() && addr_len == sizeof(pj_sockaddr_in), PJ_EINVAL); @@ -795,7 +796,7 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory, /* Create socket */ - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_STREAM, 0, &sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, &sock); if (status != PJ_SUCCESS) return status; diff --git a/pjsip/src/pjsip/sip_transport_tls_ossl.c b/pjsip/src/pjsip/sip_transport_tls_ossl.c index 454574d9..235a32e1 100644 --- a/pjsip/src/pjsip/sip_transport_tls_ossl.c +++ b/pjsip/src/pjsip/sip_transport_tls_ossl.c @@ -937,7 +937,7 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start( pjsip_endpoint *endpt, /* Create and bind socket */ - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_STREAM, 0, &listener->sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, &listener->sock); if (status != PJ_SUCCESS) goto on_error; @@ -1526,7 +1526,7 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory, addr_len && p_transport, PJ_EINVAL); /* Check that address is a sockaddr_in */ - PJ_ASSERT_RETURN(rem_addr->addr.sa_family == PJ_AF_INET && + PJ_ASSERT_RETURN(rem_addr->addr.sa_family == pj_AF_INET() && addr_len == sizeof(pj_sockaddr_in), PJ_EINVAL); @@ -1534,7 +1534,7 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory, /* Create socket */ - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_STREAM, 0, &sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, &sock); if (status != PJ_SUCCESS) return status; diff --git a/pjsip/src/pjsip/sip_transport_udp.c b/pjsip/src/pjsip/sip_transport_udp.c index 43d671da..307dc038 100644 --- a/pjsip/src/pjsip/sip_transport_udp.c +++ b/pjsip/src/pjsip/sip_transport_udp.c @@ -419,7 +419,7 @@ static pj_status_t create_socket(const pj_sockaddr_in *local_a, pj_sockaddr_in tmp_addr; pj_status_t status; - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &sock); if (status != PJ_SUCCESS) return status; @@ -508,7 +508,7 @@ static void udp_set_socket(struct udp_transport *tp, /* Adjust socket rcvbuf size */ sobuf_size = PJSIP_UDP_SO_RCVBUF_SIZE; - status = pj_sock_setsockopt(sock, PJ_SOL_SOCKET, PJ_SO_RCVBUF, + status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_RCVBUF(), &sobuf_size, sizeof(sobuf_size)); if (status != PJ_SUCCESS) { char errmsg[PJ_ERR_MSG_SIZE]; @@ -519,7 +519,7 @@ static void udp_set_socket(struct udp_transport *tp, /* Adjust socket sndbuf size */ sobuf_size = PJSIP_UDP_SO_SNDBUF_SIZE; - status = pj_sock_setsockopt(sock, PJ_SOL_SOCKET, PJ_SO_SNDBUF, + status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_SNDBUF(), &sobuf_size, sizeof(sobuf_size)); if (status != PJ_SUCCESS) { char errmsg[PJ_ERR_MSG_SIZE]; @@ -639,7 +639,7 @@ PJ_DEF(pj_status_t) pjsip_udp_transport_attach( pjsip_endpoint *endpt, tp->base.key.type = PJSIP_TRANSPORT_UDP; /* Remote address is left zero (except the family) */ - tp->base.key.rem_addr.addr.sa_family = PJ_AF_INET; + tp->base.key.rem_addr.addr.sa_family = pj_AF_INET(); /* Type name. */ tp->base.type_name = "UDP"; diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index c0e6098a..f2d18dc3 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -1080,7 +1080,7 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr, return status; } - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &sock); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "socket() error", status); return status; @@ -1151,7 +1151,7 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr, return status; } - p_pub_addr->sin_family = PJ_AF_INET; + p_pub_addr->sin_family = pj_AF_INET(); p_pub_addr->sin_port = pj_htons((pj_uint16_t)port); } diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 2105a061..6f646fb8 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -243,7 +243,7 @@ static pj_status_t create_rtp_rtcp_sock(const pjsua_transport_config *cfg, for (i=0; ientry[r->count].addr_len = sizeof(pj_sockaddr_in); a = (pj_sockaddr_in *)&r->entry[r->count].addr; - a->sin_family = PJ_AF_INET; + a->sin_family = pj_AF_INET(); tmp = pj_str(addr); a->sin_addr = pj_inet_addr(&tmp); a->sin_port = pj_htons((pj_uint16_t)port); -- cgit v1.2.3