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

Timestamp:

Jan 30, 2006 6:40:05 PM (18 years ago)

Author:

bennylp

Message:

Finished implementation of UA layer (to be tested)

File:

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

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

@@ -62 +62 @@
         PJSIP_MOD_PRIORITY_TSX_LAYER,   /* Priority.                */
         NULL,                           /* User_data.               */
-        0,                              /* Methods count.           */
-        { NULL },                       /* Array of methods.        */
         mod_tsx_layer_load,             /* load().                  */
         mod_tsx_layer_start,            /* start()                  */
@@ -508 +506 @@
 
     /* Check if no transaction with the same key exists. */
-    if (pj_hash_get( mod_tsx_layer.htable, &tsx->transaction_key.ptr,
-                     tsx->transaction_key.slen) != NULL)
-    {
-        pj_mutex_unlock(mod_tsx_layer.mutex);
-        return PJ_EEXISTS;
-    }
+    PJ_ASSERT_ON_FAIL(pj_hash_get( mod_tsx_layer.htable, 
+                                   &tsx->transaction_key.ptr,
+                                   tsx->transaction_key.slen, 
+                                   &tsx->hashed_key) == NULL,
+                        {
+                            pj_mutex_unlock(mod_tsx_layer.mutex);
+                            return PJ_EEXISTS;
+                        }
+                      );
 
     /* Register the transaction to the hash table. */
     pj_hash_set( tsx->pool, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, tsx);
+                 tsx->transaction_key.slen, tsx->hashed_key, tsx);
 
     /* Unlock mutex. */
@@ -539 +540 @@
     /* Register the transaction to the hash table. */
     pj_hash_set( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, NULL);
+                 tsx->transaction_key.slen, tsx->hashed_key, NULL);
 
     /* Unlock mutex. */
@@ -555 +556 @@
 
     pj_mutex_lock(mod_tsx_layer.mutex);
-    tsx = pj_hash_get( mod_tsx_layer.htable, key->ptr, key->slen );
+    tsx = pj_hash_get( mod_tsx_layer.htable, key->ptr, key->slen, NULL );
     pj_mutex_unlock(mod_tsx_layer.mutex);
 
@@ -649 +650 @@
     pj_mutex_lock( mod_tsx_layer.mutex );
 
-    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen );
+    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, NULL );
 
     if (tsx == NULL || tsx->state == PJSIP_TSX_STATE_TERMINATED) {
@@ -690 +691 @@
     pj_mutex_lock( mod_tsx_layer.mutex );
 
-    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen );
+    tsx = pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, NULL );
 
     if (tsx == NULL || tsx->state == PJSIP_TSX_STATE_TERMINATED) {
@@ -1036 +1037 @@
                          &via->branch_param);
 
+    /* Calculate hashed key value. */
+    tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
+                                   tsx->transaction_key.slen);
+
     PJ_LOG(6, (tsx->obj_name, "tsx_key=%.*s", tsx->transaction_key.slen,
                tsx->transaction_key.ptr));
@@ -1141 +1146 @@
     }
 
+    /* Calculate hashed key value. */
+    tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
+                                   tsx->transaction_key.slen);
+
     /* Duplicate branch parameter for transaction. */
     branch = &rdata->msg_info.via->branch_param;
@@ -1179 +1188 @@
         return status;
     }
+
+    /* Put this transaction in rdata's mod_data. */
+    rdata->endpt_info.mod_data[mod_tsx_layer.mod.id] = tsx;
 
     /* Unlock transaction and return. */