Changeset 1241 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

May 2, 2007 5:14:29 AM (17 years ago)

Author:

bennylp

Message:

Ported PJSIP and PJSIP-SIMPLE to Symbian

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (18 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -289 +289 @@
                    9 +                      /* Via port. */
                    16;                      /* Separator+Allowance. */
-    key = p = pj_pool_alloc(pool, len_required);
+    key = p = (char*) pj_pool_alloc(pool, len_required);
     end = p + len_required;
 
@@ -356 +356 @@
     PJ_ASSERT_RETURN(pool && key && method && branch, PJ_EINVAL);
 
-    p = key->ptr = pj_pool_alloc(pool, branch->slen + method->name.slen + 4 );
+    p = key->ptr = (char*) 
+                   pj_pool_alloc(pool, branch->slen + method->name.slen + 4 );
     
     /* Add role. */
@@ -594 +595 @@
 
     pj_mutex_lock(mod_tsx_layer.mutex);
-    tsx = pj_hash_get( mod_tsx_layer.htable, key->ptr, key->slen, &hval );
+    tsx = (pjsip_transaction*)
+          pj_hash_get( mod_tsx_layer.htable, key->ptr, key->slen, &hval );
     pj_mutex_unlock(mod_tsx_layer.mutex);
 
@@ -645 +647 @@
     it = pj_hash_first(mod_tsx_layer.htable, &it_buf);
     while (it) {
-        pjsip_transaction *tsx = pj_hash_this(mod_tsx_layer.htable, it);
+        pjsip_transaction *tsx = (pjsip_transaction*) 
+                                 pj_hash_this(mod_tsx_layer.htable, it);
         pj_hash_iterator_t *next = pj_hash_next(mod_tsx_layer.htable, it);
         if (tsx) {
@@ -706 +709 @@
     pj_mutex_lock( mod_tsx_layer.mutex );
 
-    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
+    tsx = (pjsip_transaction*) 
+          pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
 
 
@@ -754 +758 @@
     pj_mutex_lock( mod_tsx_layer.mutex );
 
-    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
+    tsx = (pjsip_transaction*) 
+          pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
 
 
@@ -792 +797 @@
 PJ_DEF(pjsip_transaction*) pjsip_rdata_get_tsx( pjsip_rx_data *rdata )
 {
-    return rdata->endpt_info.mod_data[mod_tsx_layer.mod.id];
+    return (pjsip_transaction*) 
+           rdata->endpt_info.mod_data[mod_tsx_layer.mod.id];
 }
 
@@ -817 +823 @@
         } else {
             while (it != NULL) {
-                pjsip_transaction *tsx = pj_hash_this(mod_tsx_layer.htable,it);
+                pjsip_transaction *tsx = (pjsip_transaction*) 
+                                         pj_hash_this(mod_tsx_layer.htable,it);
 
                 PJ_LOG(3, (THIS_FILE, " %s %s|%d|%s",
@@ -895 +902 @@
         return PJ_ENOMEM;
 
-    tsx = pj_pool_zalloc(pool, sizeof(pjsip_transaction));
+    tsx = PJ_POOL_ZALLOC_T(pool, pjsip_transaction);
     tsx->pool = pool;
     tsx->tsx_user = tsx_user;
@@ -966 +973 @@
 
     /* Clear TLS, so that mutex will not be unlocked */
-    lck = pj_thread_local_get(pjsip_tsx_lock_tls_id);
+    lck = (struct tsx_lock_data*) pj_thread_local_get(pjsip_tsx_lock_tls_id);
     while (lck) {
         if (lck->tsx == tsx) {
@@ -990 +997 @@
 {
     pjsip_event event;
-    pjsip_transaction *tsx = entry->user_data;
+    pjsip_transaction *tsx = (pjsip_transaction*) entry->user_data;
     struct tsx_lock_data lck;
 
@@ -1043 +1050 @@
      */
     if (event_src_type==PJSIP_EVENT_RX_MSG && tsx->tsx_user) {
-        pjsip_rx_data *rdata = event_src;
+        pjsip_rx_data *rdata = (pjsip_rx_data*) event_src;
 
         pj_assert(rdata != NULL);
@@ -1124 +1131 @@
 
     /* Make sure CSeq header is present. */
-    cseq = pjsip_msg_find_hdr(msg, PJSIP_H_CSEQ, NULL);
+    cseq = (pjsip_cseq_hdr*) pjsip_msg_find_hdr(msg, PJSIP_H_CSEQ, NULL);
     if (!cseq) {
         pj_assert(!"CSeq header not present in outgoing message!");
@@ -1150 +1157 @@
 
     /* Generate Via header if it doesn't exist. */
-    via = pjsip_msg_find_hdr(msg, PJSIP_H_VIA, NULL);
+    via = (pjsip_via_hdr*) pjsip_msg_find_hdr(msg, PJSIP_H_VIA, NULL);
     if (via == NULL) {
         via = pjsip_via_hdr_create(tdata->pool);
@@ -1159 +1166 @@
     if (via->branch_param.slen == 0) {
         pj_str_t tmp;
-        via->branch_param.ptr = pj_pool_alloc(tsx->pool, PJSIP_MAX_BRANCH_LEN);
+        via->branch_param.ptr = (char*)
+                                pj_pool_alloc(tsx->pool, PJSIP_MAX_BRANCH_LEN);
         via->branch_param.slen = PJSIP_MAX_BRANCH_LEN;
         pj_memcpy(via->branch_param.ptr, PJSIP_RFC3261_BRANCH_ID, 
@@ -1510 +1518 @@
                                pj_ssize_t sent, pj_bool_t *cont )
 {
-    pjsip_transaction *tsx = send_state->token;
+    pjsip_transaction *tsx = (pjsip_transaction*) send_state->token;
     struct tsx_lock_data lck;
 
@@ -1630 +1638 @@
 {
     if (sent < 0) {
-        pjsip_transaction *tsx = token;
+        pjsip_transaction *tsx = (pjsip_transaction*) token;
         struct tsx_lock_data lck;
         char errmsg[PJ_ERR_MSG_SIZE];
@@ -2274 +2282 @@
              */
             if (!tsx->is_reliable) {
-                pjsip_cseq_hdr *cseq = pjsip_msg_find_hdr( msg, PJSIP_H_CSEQ,
+                pjsip_cseq_hdr *cseq = (pjsip_cseq_hdr*)
+                                       pjsip_msg_find_hdr( msg, PJSIP_H_CSEQ,
                                                            NULL);
                 if (cseq->method.id == PJSIP_INVITE_METHOD) {