diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-05-01 12:25:01 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-05-01 12:25:01 +0000 |
commit | b93717c9a39a0755f65df6b252b1e3506d7a42c8 (patch) | |
tree | eda8b2d7372c7c8c2e13a387f63fefb238aa2374 /pjnath | |
parent | e4d10ec39863e84681c5b685d8b46e9c7351f5b4 (diff) |
Ported PJLIB-UTIL and PJNATH to Symbian
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1239 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
-rw-r--r-- | pjnath/src/pjnath/ice_session.c | 15 | ||||
-rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjnath/stun_session.c | 25 |
3 files changed, 24 insertions, 20 deletions
diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c index 4156e395..085227dd 100644 --- a/pjnath/src/pjnath/ice_session.c +++ b/pjnath/src/pjnath/ice_session.c @@ -296,7 +296,7 @@ PJ_DEF(pj_status_t) pj_ice_sess_create(pj_stun_config *stun_cfg, } if (local_ufrag == NULL) { - ice->rx_ufrag.ptr = pj_pool_alloc(ice->pool, 16); + ice->rx_ufrag.ptr = (char*) pj_pool_alloc(ice->pool, 16); pj_create_random_string(ice->rx_ufrag.ptr, 16); ice->rx_ufrag.slen = 16; } else { @@ -304,7 +304,7 @@ PJ_DEF(pj_status_t) pj_ice_sess_create(pj_stun_config *stun_cfg, } if (local_passwd == NULL) { - ice->rx_pass.ptr = pj_pool_alloc(ice->pool, 16); + ice->rx_pass.ptr = (char*) pj_pool_alloc(ice->pool, 16); pj_create_random_string(ice->rx_pass.ptr, 16); ice->rx_pass.slen = 16; } else { @@ -396,8 +396,8 @@ PJ_DEF(pj_status_t) pj_ice_sess_set_prefs(pj_ice_sess *ice, const pj_uint8_t prefs[4]) { PJ_ASSERT_RETURN(ice && prefs, PJ_EINVAL); - ice->prefs = pj_pool_calloc(ice->pool, PJ_ARRAY_SIZE(prefs), - sizeof(pj_uint8_t)); + ice->prefs = (pj_uint8_t*) pj_pool_calloc(ice->pool, PJ_ARRAY_SIZE(prefs), + sizeof(pj_uint8_t)); pj_memcpy(ice->prefs, prefs, sizeof(prefs)); return PJ_SUCCESS; } @@ -1708,7 +1708,7 @@ static void on_stun_request_complete(pj_stun_session *stun_sess, * the response match the source IP address and port that the Binding * Request was sent from. */ - if (sockaddr_cmp(&check->rcand->addr, src_addr) != 0) { + if (sockaddr_cmp(&check->rcand->addr, (const pj_sockaddr*)src_addr) != 0) { status = PJNATH_EICEINSRCADDR; LOG4((ice->obj_name, "Check %s%s: connectivity check FAILED: source address mismatch", @@ -2063,7 +2063,7 @@ static void handle_incoming_check(pj_ice_sess *ice, pj_memcpy(&rcand->addr, &rcheck->src_addr, rcheck->src_addr_len); /* Foundation is random, unique from other foundation */ - rcand->foundation.ptr = pj_pool_alloc(ice->pool, 36); + rcand->foundation.ptr = (char*) pj_pool_alloc(ice->pool, 36); rcand->foundation.slen = pj_ansi_snprintf(rcand->foundation.ptr, 36, "f%p", rcand->foundation.ptr); @@ -2302,7 +2302,8 @@ PJ_DEF(pj_status_t) pj_ice_sess_on_rx_pkt(pj_ice_sess *ice, goto on_return; } - stun_status = pj_stun_msg_check(pkt, pkt_size, PJ_STUN_IS_DATAGRAM); + stun_status = pj_stun_msg_check((const pj_uint8_t*)pkt, pkt_size, + PJ_STUN_IS_DATAGRAM); if (stun_status == PJ_SUCCESS) { status = pj_stun_session_on_rx_pkt(comp->stun_sess, pkt, pkt_size, PJ_STUN_IS_DATAGRAM, diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index 2ae84828..e0092f26 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -1494,7 +1494,7 @@ pj_stun_binary_attr_create(pj_pool_t *pool, if (data && length) { attr->length = length; - attr->data = pj_pool_alloc(pool, length); + attr->data = (pj_uint8_t*) pj_pool_alloc(pool, length); pj_memcpy(attr->data, data, length); } @@ -1536,7 +1536,7 @@ static pj_status_t decode_binary_attr(pj_pool_t *pool, /* Copy the data to the attribute */ attr->length = attr->hdr.length; - attr->data = pj_pool_alloc(pool, attr->length); + attr->data = (pj_uint8_t*) pj_pool_alloc(pool, attr->length); pj_memcpy(attr->data, buf+ATTR_HDR_LEN, attr->length); /* Done */ diff --git a/pjnath/src/pjnath/stun_session.c b/pjnath/src/pjnath/stun_session.c index 8d9f6852..541288de 100644 --- a/pjnath/src/pjnath/stun_session.c +++ b/pjnath/src/pjnath/stun_session.c @@ -380,7 +380,7 @@ PJ_DEF(pj_status_t) pj_stun_session_create( pj_stun_config *cfg, pj_memcpy(&sess->cb, cb, sizeof(*cb)); sess->use_fingerprint = fingerprint; - sess->srv_name.ptr = pj_pool_alloc(pool, 32); + sess->srv_name.ptr = (char*) pj_pool_alloc(pool, 32); sess->srv_name.slen = pj_ansi_snprintf(sess->srv_name.ptr, 32, "pj_stun-%s", PJ_VERSION); @@ -453,7 +453,7 @@ PJ_DEF(void) pj_stun_session_set_credential(pj_stun_session *sess, PJ_ASSERT_ON_FAIL(sess, return); if (cred) { if (!sess->cred) - sess->cred = pj_pool_alloc(sess->pool, sizeof(pj_stun_auth_cred)); + sess->cred = PJ_POOL_ALLOC_T(sess->pool, pj_stun_auth_cred); pj_stun_auth_cred_dup(sess->pool, sess->cred, cred); } else { sess->cred = NULL; @@ -598,8 +598,9 @@ PJ_DEF(pj_status_t) pj_stun_session_send_msg( pj_stun_session *sess, } /* Encode message */ - status = pj_stun_msg_encode(tdata->msg, tdata->pkt, tdata->max_len, - 0, get_passwd(sess, tdata->pool, tdata->msg), + status = pj_stun_msg_encode(tdata->msg, (pj_uint8_t*)tdata->pkt, + tdata->max_len, 0, + get_passwd(sess, tdata->pool, tdata->msg), &tdata->pkt_size); if (status != PJ_SUCCESS) { pj_stun_msg_destroy_tdata(sess, tdata); @@ -752,7 +753,7 @@ static pj_status_t send_response(pj_stun_session *sess, /* Alloc packet buffer */ out_max_len = PJ_STUN_MAX_PKT_LEN; - out_pkt = pj_pool_alloc(pool, out_max_len); + out_pkt = (pj_uint8_t*) pj_pool_alloc(pool, out_max_len); /* Encode */ status = pj_stun_msg_encode(response, out_pkt, out_max_len, 0, @@ -958,7 +959,7 @@ PJ_DEF(pj_status_t) pj_stun_session_on_rx_pkt(pj_stun_session *sess, return status; } - dump = pj_pool_alloc(tmp_pool, PJ_STUN_MAX_PKT_LEN); + dump = (char*) pj_pool_alloc(tmp_pool, PJ_STUN_MAX_PKT_LEN); PJ_LOG(5,(SNAME(sess), "RX STUN message:\n" @@ -980,8 +981,8 @@ PJ_DEF(pj_status_t) pj_stun_session_on_rx_pkt(pj_stun_session *sess, * is specified in the option. */ if ((options & PJ_STUN_NO_AUTHENTICATE) == 0) { - status = authenticate_msg(sess, packet, pkt_size, msg, tmp_pool, - src_addr, src_addr_len); + status = authenticate_msg(sess, (const pj_uint8_t*) packet, pkt_size, + msg, tmp_pool, src_addr, src_addr_len); if (status != PJ_SUCCESS) { goto on_return; } @@ -995,12 +996,14 @@ PJ_DEF(pj_status_t) pj_stun_session_on_rx_pkt(pj_stun_session *sess, } else if (PJ_STUN_IS_REQUEST(msg->hdr.type)) { - status = on_incoming_request(sess, tmp_pool, packet, pkt_size, msg, - src_addr, src_addr_len); + status = on_incoming_request(sess, tmp_pool, + (const pj_uint8_t*) packet, pkt_size, + msg, src_addr, src_addr_len); } else if (PJ_STUN_IS_INDICATION(msg->hdr.type)) { - status = on_incoming_indication(sess, tmp_pool, packet, pkt_size, + status = on_incoming_indication(sess, tmp_pool, + (const pj_uint8_t*) packet, pkt_size, msg, src_addr, src_addr_len); } else { |