Changeset 1239 for pjproject/trunk/pjnath/src/pjnath/ice_session.c

Timestamp:

May 1, 2007 12:25:01 PM (17 years ago)

Author:

bennylp

Message:

Ported PJLIB-UTIL and PJNATH to Symbian

File:

• pjproject/trunk/pjnath/src/pjnath/ice_session.c (modified) (6 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -297 +297 @@
 
     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;
@@ -305 +305 @@
 
     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;
@@ -397 +397 @@
 {
     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;
@@ -1709 +1709 @@
      * 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, 
@@ -2064 +2064 @@
 
         /* 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", 
@@ -2303 +2303 @@
     }
 
-    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,