Changeset 738:d666051658bd in freeDiameter for libfdproto

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:

libfdproto

Files:

• ostr.c (modified) (2 diffs)
• rt_data.c (modified) (2 diffs)

libfdproto/ostr.c

@@ -69 +69 @@
 }
 
-/* a little less sensitive to case, slower. */
-int fd_os_almostcasecmp_int(uint8_t * os1, size_t os1sz, uint8_t * os2, size_t os2sz)
+/* less sensitive to case, slower. */
+int fd_os_almostcasesrch_int(uint8_t * os1, size_t os1sz, uint8_t * os2, size_t os2sz, int *maybefurther)
 {
         int i;
+        int res = 0;
+        
         ASSERT( os1 && os2);
+        if (maybefurther)
+                *maybefurther = 0;
+        
         if (os1sz < os2sz)
                 return -1;
+        
+        if (maybefurther)
+                *maybefurther = 1;
+        
         if (os1sz > os2sz)
                 return 1;
@@ -83 +92 @@
                         continue;
                 
+                if (!res) 
+                        res = os1[i] < os2[i] ? -1 : 1;
+                
                 if (asciitolower(os1[i]) == asciitolower(os2[i])) 
                         continue;
                 
-                return os1[i] < os2[i] ? -1 : 1;
+                return res;
         }
         

libfdproto/rt_data.c

@@ -160 +160 @@
         for (li = rtd->candidates.next; li != &rtd->candidates; li = li->next) {
                 struct rtd_candidate * c = (struct rtd_candidate *) li;
-                
-                int cmp = fd_os_almostcasecmp(id, idsz, c->diamid, c->diamidlen);
+                int cont;
+                int cmp = fd_os_almostcasesrch(id, idsz, c->diamid, c->diamidlen, &cont);
                 
                 if (!cmp) {
@@ -172 +172 @@
                 }
                 
-                if (cmp > 0)
+                if (cont)
                         continue;