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

Timestamp:

Jul 18, 2012 7:52:33 AM (12 years ago)

Author:

ming

Message:

Fixed #1556: Fix From/To? tag and Via branch comparison to be case insensitive

File:

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

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

@@ -404 +404 @@
     const pj_str_t *branch = &rdata->msg_info.via->branch_param;
 
-    if (pj_strncmp(branch,&rfc3261_branch,PJSIP_RFC3261_BRANCH_LEN)==0) {
+    if (pj_strnicmp(branch,&rfc3261_branch,PJSIP_RFC3261_BRANCH_LEN)==0) {
 
         /* Create transaction key. */
@@ -549 +549 @@
      * twice!
      */
-    if(pj_hash_get(mod_tsx_layer.htable, 
-                   tsx->transaction_key.ptr,
-                   tsx->transaction_key.slen, 
-                   NULL))
+    if(pj_hash_get_lower(mod_tsx_layer.htable, 
+                         tsx->transaction_key.ptr,
+                         tsx->transaction_key.slen, 
+                         NULL))
     {
         pj_mutex_unlock(mod_tsx_layer.mutex);
@@ -569 +569 @@
     /* Register the transaction to the hash table. */
 #ifdef PRECALC_HASH
-    pj_hash_set( tsx->pool, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, tsx->hashed_key, tsx);
+    pj_hash_set_lower( tsx->pool, mod_tsx_layer.htable,
+                       tsx->transaction_key.ptr,
+                       tsx->transaction_key.slen, tsx->hashed_key, tsx);
 #else
-    pj_hash_set( tsx->pool, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, 0, tsx);
+    pj_hash_set_lower( tsx->pool, mod_tsx_layer.htable,
+                       tsx->transaction_key.ptr,
+                       tsx->transaction_key.slen, 0, tsx);
 #endif
 
@@ -605 +607 @@
     /* Register the transaction to the hash table. */
 #ifdef PRECALC_HASH
-    pj_hash_set( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, tsx->hashed_key, NULL);
+    pj_hash_set_lower( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
+                       tsx->transaction_key.slen, tsx->hashed_key, NULL);
 #else
-    pj_hash_set( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
-                 tsx->transaction_key.slen, 0, NULL);
+    pj_hash_set_lower( NULL, mod_tsx_layer.htable, tsx->transaction_key.ptr,
+                       tsx->transaction_key.slen, 0, NULL);
 #endif
 
@@ -652 +654 @@
     pj_mutex_lock(mod_tsx_layer.mutex);
     tsx = (pjsip_transaction*)
-          pj_hash_get( mod_tsx_layer.htable, key->ptr, key->slen, &hval );
+          pj_hash_get_lower( mod_tsx_layer.htable, key->ptr, key->slen,
+                             &hval );
     pj_mutex_unlock(mod_tsx_layer.mutex);
 
@@ -786 +789 @@
 
     tsx = (pjsip_transaction*) 
-          pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
+          pj_hash_get_lower( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
 
 
@@ -835 +838 @@
 
     tsx = (pjsip_transaction*) 
-          pj_hash_get( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
+          pj_hash_get_lower( mod_tsx_layer.htable, key.ptr, key.slen, &hval );
 
 
@@ -1300 +1303 @@
     /* Calculate hashed key value. */
 #ifdef PRECALC_HASH
-    tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
-                                   tsx->transaction_key.slen);
+    tsx->hashed_key = pj_hash_calc_tolower(0, NULL, &tsx->transaction_key);
 #endif
 
@@ -1433 +1435 @@
     /* Calculate hashed key value. */
 #ifdef PRECALC_HASH
-    tsx->hashed_key = pj_hash_calc(0, tsx->transaction_key.ptr,
-                                   tsx->transaction_key.slen);
+    tsx->hashed_key = pj_hash_calc_tolower(0, NULL, &tsx->transaction_key);
 #endif