Changeset 738:d666051658bd in freeDiameter for libfdcore

Timestamp:

Mar 2, 2011, 6:21:59 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix broken 'almostcasecmp' logic

Location:

libfdcore

Files:

• p_ce.c (modified) (2 diffs)
• peers.c (modified) (7 diffs)
• routing_dispatch.c (modified) (3 diffs)

libfdcore/p_ce.c

@@ -304 +304 @@
                                 
                                 /* We check that the value matches what we know, otherwise disconnect the peer */
-                                if (fd_os_almostcasecmp(hdr->avp_value->os.data, hdr->avp_value->os.len, 
-                                                        peer->p_hdr.info.pi_diamid, peer->p_hdr.info.pi_diamidlen)) {
+                                if (fd_os_almostcasesrch(hdr->avp_value->os.data, hdr->avp_value->os.len, 
+                                                        peer->p_hdr.info.pi_diamid, peer->p_hdr.info.pi_diamidlen, NULL)) {
                                         TRACE_DEBUG(INFO, "Received a message with Origin-Host set to '%.*s' while expecting '%s'\n", 
                                                         hdr->avp_value->os.len, hdr->avp_value->os.data, peer->p_hdr.info.pi_diamid);
@@ -813 +813 @@
         if (peer->p_hdr.info.config.pic_realm) {
                 size_t len = strlen(peer->p_hdr.info.config.pic_realm);
-                if (fd_os_almostcasecmp(peer->p_hdr.info.config.pic_realm, len, peer->p_hdr.info.runtime.pir_realm, peer->p_hdr.info.runtime.pir_realmlen)) {
+                if (fd_os_almostcasesrch(peer->p_hdr.info.config.pic_realm, len, peer->p_hdr.info.runtime.pir_realm, peer->p_hdr.info.runtime.pir_realmlen, NULL)) {
                         TRACE_DEBUG(INFO, "Rejected CER from peer '%s', realm mismatch with configured value (returning DIAMETER_UNKNOWN_PEER).\n", peer->p_hdr.info.pi_diamid);
                         pei.pei_errcode = "DIAMETER_UNKNOWN_PEER"; /* maybe AVP_NOT_ALLOWED would be better fit? */

libfdcore/peers.c

@@ -94 +94 @@
 {
         struct fd_peer *p = NULL;
-        struct fd_list * li;
+        struct fd_list * li, *li_inf;
         int ret = 0;
         
@@ -143 +143 @@
         /* Ok, now check if we don't already have an entry with the same Diameter Id, and insert this one */
         CHECK_POSIX( pthread_rwlock_wrlock(&fd_g_peers_rw) );
-        
+        li_inf = &fd_g_peers;
         for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) {
                 struct fd_peer * next = (struct fd_peer *)li;
-                int cmp = fd_os_almostcasecmp( p->p_hdr.info.pi_diamid, p->p_hdr.info.pi_diamidlen, 
-                                                next->p_hdr.info.pi_diamid, next->p_hdr.info.pi_diamidlen );
-                if (cmp > 0)
-                        continue;
-                if (cmp == 0)
+                int cont;
+                int cmp = fd_os_almostcasesrch( p->p_hdr.info.pi_diamid, p->p_hdr.info.pi_diamidlen, 
+                                                next->p_hdr.info.pi_diamid, next->p_hdr.info.pi_diamidlen,
+                                                &cont );
+                if (cmp < 0)
+                        li_inf = li;
+                
+                if (cmp == 0) {
                         ret = EEXIST;
-                break;
+                        break;
+                }
+                if (!cont)
+                        break;
         }
         
@@ -162 +168 @@
 
                         /* Insert the new element in the list */
-                        fd_list_insert_before( li, &p->p_hdr.chain );
+                        fd_list_insert_after( li_inf, &p->p_hdr.chain );
                 } while (0);
 
@@ -185 +191 @@
         /* Search in the list */
         CHECK_POSIX( pthread_rwlock_rdlock(&fd_g_peers_rw) );
-        for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) {
-                struct fd_peer * next = (struct fd_peer *)li;
-                int cmp;
-                if (igncase)
-                        cmp = fd_os_almostcasecmp( diamid, diamidlen, next->p_hdr.info.pi_diamid, next->p_hdr.info.pi_diamidlen );
-                else
-                        cmp = fd_os_cmp( diamid, diamidlen, next->p_hdr.info.pi_diamid, next->p_hdr.info.pi_diamidlen );
-                if (cmp > 0)
-                        continue;
-                if (cmp == 0)
-                        *peer = &next->p_hdr;
-                break;
-        }
+        if (igncase)
+                for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) {
+                        struct fd_peer * next = (struct fd_peer *)li;
+                        int cmp, cont;
+                        cmp = fd_os_almostcasesrch( diamid, diamidlen, next->p_hdr.info.pi_diamid, next->p_hdr.info.pi_diamidlen, &cont );
+                        if (cmp == 0) {
+                                *peer = &next->p_hdr;
+                                break;
+                        }
+                        if (!cont)
+                                break;
+                }
+        else
+                for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) {
+                        struct fd_peer * next = (struct fd_peer *)li;
+                        int cmp = fd_os_cmp( diamid, diamidlen, next->p_hdr.info.pi_diamid, next->p_hdr.info.pi_diamidlen );
+                        if (cmp > 0)
+                                continue;
+                        if (cmp == 0)
+                                *peer = &next->p_hdr;
+                        break;
+                }
         CHECK_POSIX( pthread_rwlock_unlock(&fd_g_peers_rw) );
         
@@ -429 +444 @@
         struct avp *avp_oh;
         struct avp_hdr * avp_hdr;
-        struct fd_list * li;
+        struct fd_list * li, *li_inf;
         int found = 0;
         int ret = 0;
@@ -470 +485 @@
         CHECK_POSIX( pthread_rwlock_wrlock(&fd_g_peers_rw) );
         
+        li_inf = &fd_g_peers;
         for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) {
-                int cmp;
+                int cmp, cont;
                 peer = (struct fd_peer *)li->o;
-                cmp = fd_os_almostcasecmp( avp_hdr->avp_value->os.data, avp_hdr->avp_value->os.len, peer->p_hdr.info.pi_diamid, peer->p_hdr.info.pi_diamidlen );
-                if (cmp > 0)
+                cmp = fd_os_almostcasesrch( avp_hdr->avp_value->os.data, avp_hdr->avp_value->os.len, peer->p_hdr.info.pi_diamid, peer->p_hdr.info.pi_diamidlen, &cont );
+                if (cmp < 0) {
+                        li_inf = li;
                         continue;
-                if (cmp == 0)
+                }
+                if (cmp == 0) {
                         found = 1;
-                break;
+                        break;
+                }
+                if (!cont)
+                        break;
         }
         
@@ -500 +521 @@
                 
                 /* Insert the new peer in the list (the PSM will take care of setting the expiry after validation) */
-                fd_list_insert_before( li, &peer->p_hdr.chain );
+                fd_list_insert_after( li_inf, &peer->p_hdr.chain );
                 
                 /* Start the PSM, which will receive the event bellow */

libfdcore/routing_dispatch.c

@@ -274 +274 @@
                 
                 /* In the AVPs, the value comes from the network, so let's be case permissive */
-                if (dh && !fd_os_almostcasecmp(dh->os.data, dh->os.len, c->diamid, c->diamidlen) ) {
+                if (dh && !fd_os_almostcasesrch(dh->os.data, dh->os.len, c->diamid, c->diamidlen, NULL) ) {
                         /* The candidate is the Destination-Host */
                         c->score += FD_SCORE_FINALDEST;
                 } else {
-                        if (dr && !fd_os_almostcasecmp(dr->os.data, dr->os.len, c->realm, c->realmlen) ) {
+                        if (dr && !fd_os_almostcasesrch(dr->os.data, dr->os.len, c->realm, c->realmlen, NULL) ) {
                                 /* The candidate's realm matchs the Destination-Realm */
                                 c->score += FD_SCORE_REALM;
@@ -592 +592 @@
                                                 ASSERT( ahdr->avp_value );
                                                 /* Compare the Destination-Host AVP of the message with our identity */
-                                                if (!fd_os_almostcasecmp(ahdr->avp_value->os.data, ahdr->avp_value->os.len, fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len)) {
+                                                if (!fd_os_almostcasesrch(ahdr->avp_value->os.data, ahdr->avp_value->os.len, fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len, NULL)) {
                                                         is_dest_host = YES;
                                                 } else {
@@ -613 +613 @@
                                                 dr_val = ahdr->avp_value;
                                                 /* Compare the Destination-Realm AVP of the message with our identity */
-                                                if (!fd_os_almostcasecmp(dr_val->os.data, dr_val->os.len, fd_g_config->cnf_diamrlm, fd_g_config->cnf_diamrlm_len)) {
+                                                if (!fd_os_almostcasesrch(dr_val->os.data, dr_val->os.len, fd_g_config->cnf_diamrlm, fd_g_config->cnf_diamrlm_len, NULL)) {
                                                         is_dest_realm = YES;
                                                 } else {