diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-07-20 08:08:30 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-07-20 08:08:30 +0000 |
commit | d24a9aee403d6540ec792d3b56a1934fbc0969d4 (patch) | |
tree | 0706522f9173a479f4f3af4e6fbf1e1cddb9ef2b /pjnath | |
parent | c3f4bae326d9e2dfa78d23f288e822e7ae16c2db (diff) |
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
Diffstat (limited to 'pjnath')
-rw-r--r-- | pjnath/src/pjnath/ice_session.c | 6 | ||||
-rw-r--r-- | pjnath/src/pjnath/ice_strans.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjnath/stun_msg_dump.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjnath/stun_session.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjstun-client/client_main.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/bind_usage.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/main.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/turn_usage.c | 28 |
9 files changed, 27 insertions, 27 deletions
diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c index 8bce5a82..0c33207f 100644 --- a/pjnath/src/pjnath/ice_session.c +++ b/pjnath/src/pjnath/ice_session.c @@ -726,7 +726,7 @@ static const char *dump_check(char *buffer, unsigned bufsize, pj_ansi_strcpy(laddr, pj_inet_ntoa(lcand->addr.ipv4.sin_addr)); - if (lcand->addr.addr.sa_family == PJ_AF_INET) { + if (lcand->addr.addr.sa_family == pj_AF_INET()) { len = pj_ansi_snprintf(buffer, bufsize, "%d: [%d] %s:%d-->%s:%d", GET_CHECK_ID(clist, check), @@ -834,10 +834,10 @@ static int sockaddr_cmp(const pj_sockaddr *a1, const pj_sockaddr *a2) if (a1->addr.sa_family != a2->addr.sa_family) return SOCKADDR_NOT_EQUAL; - if (a1->addr.sa_family == PJ_AF_INET) { + if (a1->addr.sa_family == pj_AF_INET()) { return !(a1->ipv4.sin_addr.s_addr == a2->ipv4.sin_addr.s_addr && a1->ipv4.sin_port == a2->ipv4.sin_port); - } else if (a1->addr.sa_family == PJ_AF_INET6) { + } else if (a1->addr.sa_family == pj_AF_INET6()) { return pj_memcmp(&a1->ipv6, &a2->ipv6, sizeof(a1->ipv6)); } else { pj_assert(!"Invalid address family!"); diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c index e8344627..052e1a80 100644 --- a/pjnath/src/pjnath/ice_strans.c +++ b/pjnath/src/pjnath/ice_strans.c @@ -285,7 +285,7 @@ static pj_status_t create_component(pj_ice_strans *ice_st, pj_memcpy(comp->ka_tsx_id, &tsx_id, sizeof(comp->ka_tsx_id)); /* Create socket */ - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &comp->sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &comp->sock); if (status != PJ_SUCCESS) return status; diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index eb79f2d2..d16e1cb6 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -769,7 +769,7 @@ static pj_status_t encode_sockaddr_attr(const void *a, pj_uint8_t *buf, *buf++ = '\0'; /* Family (IPv4 only for now) */ - PJ_ASSERT_RETURN(ca->sockaddr.addr.sa_family == PJ_AF_INET, PJ_EINVAL); + PJ_ASSERT_RETURN(ca->sockaddr.addr.sa_family == pj_AF_INET(), PJ_EINVAL); *buf++ = 1; if (ca->xor_ed) { diff --git a/pjnath/src/pjnath/stun_msg_dump.c b/pjnath/src/pjnath/stun_msg_dump.c index 14baf1af..c208879f 100644 --- a/pjnath/src/pjnath/stun_msg_dump.c +++ b/pjnath/src/pjnath/stun_msg_dump.c @@ -83,13 +83,13 @@ static int print_attr(char *buffer, unsigned length, attr = (const pj_stun_sockaddr_attr*)ahdr; - if (attr->sockaddr.addr.sa_family == PJ_AF_INET) { + if (attr->sockaddr.addr.sa_family == pj_AF_INET()) { len = pj_ansi_snprintf(p, end-p, ", IPv4 addr=%s:%d\n", pj_inet_ntoa(attr->sockaddr.ipv4.sin_addr), pj_ntohs(attr->sockaddr.ipv4.sin_port)); - } else if (attr->sockaddr.addr.sa_family == PJ_AF_INET6) { + } else if (attr->sockaddr.addr.sa_family == pj_AF_INET6()) { len = pj_ansi_snprintf(p, end-p, ", IPv6 addr present\n"); } else { diff --git a/pjnath/src/pjnath/stun_session.c b/pjnath/src/pjnath/stun_session.c index 334ba1a6..2e11a81d 100644 --- a/pjnath/src/pjnath/stun_session.c +++ b/pjnath/src/pjnath/stun_session.c @@ -562,10 +562,10 @@ static void dump_tx_msg(pj_stun_session *sess, const pj_stun_msg *msg, const pj_sockaddr *dst = (const pj_sockaddr*)addr; char buf[512]; - if (dst->addr.sa_family == PJ_AF_INET) { + if (dst->addr.sa_family == pj_AF_INET()) { dst_name = pj_inet_ntoa(dst->ipv4.sin_addr); dst_port = pj_ntohs(dst->ipv4.sin_port); - } else if (dst->addr.sa_family == PJ_AF_INET6) { + } else if (dst->addr.sa_family == pj_AF_INET6()) { dst_name = "IPv6"; dst_port = pj_ntohs(dst->ipv6.sin6_port); } else { diff --git a/pjnath/src/pjstun-client/client_main.c b/pjnath/src/pjstun-client/client_main.c index 0631f014..578a582d 100644 --- a/pjnath/src/pjstun-client/client_main.c +++ b/pjnath/src/pjstun-client/client_main.c @@ -270,13 +270,13 @@ static int init() pj_stun_config_init(&g.stun_config, &g.cp.factory, 0, NULL, g.th); pj_assert(status == PJ_SUCCESS); - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &g.peer_sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &g.peer_sock); pj_assert(status == PJ_SUCCESS); status = pj_sock_bind_in(g.peer_sock, 0, 0); pj_assert(status == PJ_SUCCESS); - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &g.sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &g.sock); pj_assert(status == PJ_SUCCESS); status = pj_sockaddr_in_init(&addr, NULL, 0); diff --git a/pjnath/src/pjstun-srv-test/bind_usage.c b/pjnath/src/pjstun-srv-test/bind_usage.c index a6c9a7e2..84928af8 100644 --- a/pjnath/src/pjstun-srv-test/bind_usage.c +++ b/pjnath/src/pjstun-srv-test/bind_usage.c @@ -74,7 +74,7 @@ PJ_DEF(pj_status_t) pj_stun_bind_usage_create(pj_stun_server *srv, usage_cb.on_destroy = &usage_on_destroy; status = pj_stun_usage_create(srv, "bind%p", &usage_cb, - PJ_AF_INET, PJ_SOCK_DGRAM, 0, + pj_AF_INET(), pj_SOCK_DGRAM(), 0, &local_addr, sizeof(local_addr), &bu->usage); if (status != PJ_SUCCESS) { diff --git a/pjnath/src/pjstun-srv-test/main.c b/pjnath/src/pjstun-srv-test/main.c index 68adf459..1b5fef3b 100644 --- a/pjnath/src/pjstun-srv-test/main.c +++ b/pjnath/src/pjstun-srv-test/main.c @@ -131,7 +131,7 @@ int main(int argc, char *argv[]) } */ - status = pj_stun_turn_usage_create(srv, PJ_SOCK_DGRAM, NULL, + status = pj_stun_turn_usage_create(srv, pj_SOCK_DGRAM(), NULL, 3478, o.use_fingerprint, &turn); if (status != PJ_SUCCESS) { pj_stun_perror(THIS_FILE, "Unable to create bind usage", status); diff --git a/pjnath/src/pjstun-srv-test/turn_usage.c b/pjnath/src/pjstun-srv-test/turn_usage.c index 8549227b..409db4aa 100644 --- a/pjnath/src/pjstun-srv-test/turn_usage.c +++ b/pjnath/src/pjstun-srv-test/turn_usage.c @@ -159,7 +159,7 @@ PJ_DEF(pj_status_t) pj_stun_turn_usage_create(pj_stun_server *srv, pj_sockaddr_in local_addr; pj_status_t status; - PJ_ASSERT_RETURN(srv && (type==PJ_SOCK_DGRAM||type==PJ_SOCK_STREAM), + PJ_ASSERT_RETURN(srv && (type==pj_SOCK_DGRAM()||type==pj_SOCK_STREAM()), PJ_EINVAL); si = pj_stun_server_get_info(srv); @@ -185,7 +185,7 @@ PJ_DEF(pj_status_t) pj_stun_turn_usage_create(pj_stun_server *srv, usage_cb.on_rx_data = &tu_on_rx_data; usage_cb.on_destroy = &tu_on_destroy; status = pj_stun_usage_create(srv, "turn%p", &usage_cb, - PJ_AF_INET, tu->type, 0, + pj_AF_INET(), tu->type, 0, &local_addr, sizeof(local_addr), &tu->usage); if (status != PJ_SUCCESS) { @@ -297,7 +297,7 @@ static void tu_on_rx_data(pj_stun_usage *usage, /* STUN message decoding flag */ flags = 0; - if (tu->type == PJ_SOCK_DGRAM) + if (tu->type == pj_SOCK_DGRAM()) flags |= PJ_STUN_IS_DATAGRAM; @@ -361,7 +361,7 @@ static pj_status_t tu_alloc_port(struct turn_usage *tu, *err_code = PJ_STUN_SC_INVALID_PORT; /* Allocate specific port */ - status = pj_sock_socket(PJ_AF_INET, type, 0, &sock); + status = pj_sock_socket(pj_AF_INET(), type, 0, &sock); if (status != PJ_SUCCESS) return status; @@ -400,7 +400,7 @@ static pj_status_t tu_alloc_port(struct turn_usage *tu, break; } - status = pj_sock_socket(PJ_AF_INET, type, 0, &sock); + status = pj_sock_socket(pj_AF_INET(), type, 0, &sock); if (status != PJ_SUCCESS) return status; @@ -510,7 +510,7 @@ static pj_status_t tu_sess_on_send_msg(pj_stun_session *sess, sd = (struct session_data*) pj_stun_session_get_user_data(sess); - if (sd->tu->type == PJ_SOCK_DGRAM) { + if (sd->tu->type == pj_SOCK_DGRAM()) { return pj_stun_usage_sendto(sd->tu->usage, pkt, pkt_size, 0, dst_addr, addr_len); } else { @@ -546,9 +546,9 @@ static struct peer* client_add_peer(struct turn_client *client, static const char *get_tp_type(int type) { - if (type==PJ_SOCK_DGRAM) + if (type==pj_SOCK_DGRAM()) return "udp"; - else if (type==PJ_SOCK_STREAM) + else if (type==pj_SOCK_STREAM()) return "tcp"; else return "???"; @@ -594,7 +594,7 @@ static pj_status_t client_sess_on_send_msg(pj_stun_session *sess, sd = (struct session_data*) pj_stun_session_get_user_data(sess); - if (sd->tu->type == PJ_SOCK_DGRAM) { + if (sd->tu->type == pj_SOCK_DGRAM()) { return pj_stun_usage_sendto(sd->tu->usage, pkt, pkt_size, 0, dst_addr, addr_len); } else { @@ -951,13 +951,13 @@ static pj_status_t client_handle_allocate_req(struct turn_client *client, src_addr, src_addr_len); return PJ_SUCCESS; } else if (a_rt) { - client->sock_type = a_rt->value ? PJ_SOCK_STREAM : PJ_SOCK_DGRAM; + client->sock_type = a_rt->value ? pj_SOCK_STREAM() : pj_SOCK_DGRAM(); } else { client->sock_type = client->tu->type;; } /* Process REQUESTED-IP attribute */ - if (a_rip && a_rip->sockaddr.addr.sa_family != PJ_AF_INET) { + if (a_rip && a_rip->sockaddr.addr.sa_family != pj_AF_INET()) { client_respond(client, msg, PJ_STUN_SC_INVALID_IP_ADDR, NULL, src_addr, src_addr_len); return PJ_SUCCESS; @@ -1130,7 +1130,7 @@ static pj_status_t client_handle_sad(struct turn_client *client, /* Remote active destination needs to be cleared */ client->active_peer = NULL; - } else if (a_raddr->sockaddr.addr.sa_family != PJ_AF_INET) { + } else if (a_raddr->sockaddr.addr.sa_family != pj_AF_INET()) { /* Bad request (not IPv4) */ client_respond(client, msg, PJ_STUN_SC_BAD_REQUEST, NULL, src_addr, src_addr_len); @@ -1196,7 +1196,7 @@ static pj_status_t client_handle_send_ind(struct turn_client *client, /* REMOTE-ADDRESS not present, discard packet */ return PJ_SUCCESS; - } else if (a_raddr->sockaddr.addr.sa_family != PJ_AF_INET) { + } else if (a_raddr->sockaddr.addr.sa_family != pj_AF_INET()) { /* REMOTE-ADDRESS present but not IPv4, discard packet */ return PJ_SUCCESS; @@ -1209,7 +1209,7 @@ static pj_status_t client_handle_send_ind(struct turn_client *client, data = (const pj_uint8_t *)a_data->data; datalen = a_data->length; - } else if (client->sock_type == PJ_SOCK_STREAM) { + } else if (client->sock_type == pj_SOCK_STREAM()) { /* Discard if no Data and Allocation type is TCP */ return PJ_SUCCESS; |