Changeset 738:d666051658bd in freeDiameter for extensions

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:

extensions

Files:

• app_radgw/rgw_clients.c (modified) (1 diff)
• app_redirect/ard_rules.c (modified) (1 diff)
• rt_redirect/redir_fwd.c (modified) (1 diff)
• rt_redirect/redir_out.c (modified) (2 diffs)

extensions/app_radgw/rgw_clients.c

@@ -732 +732 @@
                 
                 /* first, check if the nas_id is the fqdn of the peer or a known alias */
-                if (!fd_os_almostcasecmp(nas_id + 1, nas_id_len, 
-                                                cli->fqdn, cli->fqdn_len)) {
+                if (!fd_os_almostcasesrch(nas_id + 1, nas_id_len, 
+                                                cli->fqdn, cli->fqdn_len, NULL)) {
                         TRACE_DEBUG(FULL, "NAS-Identifier contains the fqdn of the client");
                         found = 1;

extensions/app_redirect/ard_rules.c

@@ -94 +94 @@
         
         if (c->is_regex == 0) {
-                if ( ! fd_os_almostcasecmp(c->s, c->sl, s, l) )
+                if ( ! fd_os_almostcasesrch(c->s, c->sl, s, l, NULL) )
                         *match = 1;
         } else {

extensions/rt_redirect/redir_fwd.c

@@ -150 +150 @@
                                                 for (li = task.rh.next; li != &task.rh; li = li->next) {
                                                         struct redir_host * nhost = li->o;
-                                                        if ( fd_os_almostcasecmp(id, len, nhost->id, nhost->len) <= 0 )
+                                                        if ( fd_os_cmp(id, len, nhost->id, nhost->len) <= 0 )
                                                                 break;
                                                 }

extensions/rt_redirect/redir_out.c

@@ -171 +171 @@
                 /* Special case: ALL_HOST rules: we decrease the score of the Origin-Host if present */
                 if (e->type == ALL_HOST) {
-                        cmp = fd_os_almostcasecmp(cand->diamid, cand->diamidlen, e->data.host.s, e->data.host.l);
+                        cmp = fd_os_almostcasesrch(cand->diamid, cand->diamidlen, e->data.host.s, e->data.host.l, NULL);
                         if (!cmp) {
                                 TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (previous ALL_HOST Redirect originated from this peer)", msg, cand->diamidlen, cand->diamid, FD_SCORE_SENT_REDIRECT);
@@ -198 +198 @@
                 struct rtd_candidate * cand = (struct rtd_candidate *) lic;
                 
-                /* Is this candidate in the "Redirect-Host" list ? */
+                /* Is this candidate in the "Redirect-Host" list ? We must search caseinsentive here. */
                 for (lirh = e->target_peers_list.next; lirh != &e->target_peers_list; lirh = lirh->next) {
                         struct redir_host * host = lirh->o;
-                        
-                        cmp = fd_os_cmp( cand->diamid, cand->diamidlen, host->id, host->len );
-                        
-                        if (cmp < 0)
-                                break; /* targets are ordered */
+                        int cont;
+                        
+                        cmp = fd_os_almostcasesrch( cand->diamid, cand->diamidlen, host->id, host->len, &cont );
                         
                         if (cmp == 0) {
                                 TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (rule t:%d @%p)", msg, cand->diamidlen, cand->diamid, redirects_usages[e->type].score, e->type, e);
                                 cand->score += redirects_usages[e->type].score;
-                        }
+                                break;
+                        }
+                        if (!cont)
+                                break;
                 }
         }