Changeset 4208 for pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.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_ua_layer.c (modified) (10 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

@@ -303 +303 @@
 
         dlg_set = (struct dlg_set*)
-                  pj_hash_get( mod_ua.dlg_table, dlg->local.info->tag.ptr, 
-                               dlg->local.info->tag.slen,
-                               &dlg->local.tag_hval);
+                  pj_hash_get_lower( mod_ua.dlg_table,
+                                     dlg->local.info->tag.ptr, 
+                                     dlg->local.info->tag.slen,
+                                     &dlg->local.tag_hval);
 
         if (dlg_set) {
@@ -327 +328 @@
 
             /* Register the dialog set in the hash table. */
-            pj_hash_set_np(mod_ua.dlg_table, 
-                           dlg->local.info->tag.ptr, dlg->local.info->tag.slen,
-                           dlg->local.tag_hval, dlg_set->ht_entry, dlg_set);
+            pj_hash_set_np_lower(mod_ua.dlg_table, 
+                                 dlg->local.info->tag.ptr,
+                                 dlg->local.info->tag.slen,
+                                 dlg->local.tag_hval, dlg_set->ht_entry,
+                                 dlg_set);
         }
 
@@ -342 +345 @@
         dlg->dlg_set = dlg_set;
 
-        pj_hash_set_np(mod_ua.dlg_table, 
-                       dlg->local.info->tag.ptr, dlg->local.info->tag.slen,
-                       dlg->local.tag_hval, dlg_set->ht_entry, dlg_set);
+        pj_hash_set_np_lower(mod_ua.dlg_table, 
+                             dlg->local.info->tag.ptr,
+                             dlg->local.info->tag.slen,
+                             dlg->local.tag_hval, dlg_set->ht_entry, dlg_set);
     }
 
@@ -388 +392 @@
     /* If dialog list is empty, remove the dialog set from the hash table. */
     if (pj_list_empty(&dlg_set->dlg_list)) {
-        pj_hash_set(NULL, mod_ua.dlg_table, dlg->local.info->tag.ptr,
-                    dlg->local.info->tag.slen, dlg->local.tag_hval, NULL);
+        pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg->local.info->tag.ptr,
+                          dlg->local.info->tag.slen, dlg->local.tag_hval,
+                          NULL);
 
         /* Return dlg_set to free nodes. */
@@ -450 +455 @@
     /* Lookup the dialog set. */
     dlg_set = (struct dlg_set*)
-              pj_hash_get(mod_ua.dlg_table, local_tag->ptr, local_tag->slen,
-                          NULL);
+              pj_hash_get_lower(mod_ua.dlg_table, local_tag->ptr,
+                                local_tag->slen, NULL);
     if (dlg_set == NULL) {
         /* Not found */
@@ -463 +468 @@
     dlg = dlg_set->dlg_list.next;
     while (dlg != (pjsip_dialog*)&dlg_set->dlg_list) {  
-        if (pj_strcmp(&dlg->remote.info->tag, remote_tag) == 0)
+        if (pj_stricmp(&dlg->remote.info->tag, remote_tag) == 0)
             break;
         dlg = dlg->next;
@@ -564 +569 @@
         /* Lookup the dialog set. */
         dlg_set = (struct dlg_set*)
-                  pj_hash_get(mod_ua.dlg_table, tag->ptr, tag->slen, NULL);
+                  pj_hash_get_lower(mod_ua.dlg_table, tag->ptr, tag->slen,
+                                    NULL);
         return dlg_set;
     }
@@ -625 +631 @@
     while (dlg != (pjsip_dialog*)&dlg_set->dlg_list) {
         
-        if (pj_strcmp(&dlg->remote.info->tag, from_tag) == 0)
+        if (pj_stricmp(&dlg->remote.info->tag, from_tag) == 0)
             break;
 
@@ -762 +768 @@
         /* Get the dialog set. */
         dlg_set = (struct dlg_set*)
-                  pj_hash_get(mod_ua.dlg_table, 
-                              rdata->msg_info.from->tag.ptr,
-                              rdata->msg_info.from->tag.slen,
-                              NULL);
+                  pj_hash_get_lower(mod_ua.dlg_table, 
+                                    rdata->msg_info.from->tag.ptr,
+                                    rdata->msg_info.from->tag.slen,
+                                    NULL);
 
         if (!dlg_set) {
@@ -813 +819 @@
 
             /* Otherwise find the one with matching To tag. */
-            if (pj_strcmp(to_tag, &dlg->remote.info->tag) == 0)
+            if (pj_stricmp(to_tag, &dlg->remote.info->tag) == 0)
                 break;