Changeset 1239 for pjproject/trunk/pjnath/src/pjnath/stun_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/stun_session.c (modified) (7 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_session.c

@@ -381 +381 @@
     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);
@@ -454 +454 @@
     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 {
@@ -599 +599 @@
 
     /* 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) {
@@ -753 +754 @@
     /* 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 */
@@ -959 +960 @@
     }
 
-    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),
@@ -981 +982 @@
      */
     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;
@@ -996 +997 @@
     } 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);