Thu Jan 8 15:12:28 CST 2009 Pekka Pessi <first.last@nokia.com>

  * sresolv: using <sofia-sip/su_string.h> functions

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11805 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 0374152f052c8f586707c396173f4af0e68e51fb..03cc43ac92e5b80e0d8ffa1af202d6c196a2b261 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Feb 11 10:51:07 CST 2009
+Wed Feb 11 10:51:28 CST 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c
index 3d9e6329e8be882d5ae632c8efdbe916a3de9895..978f4cef856c2699ff86c23261f2a0e52d85443e 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c
@@ -41,6 +41,7 @@
 #define SRES_CONTEXT_T struct context
 
 #include "sofia-sip/sresolv.h"
+#include "sofia-sip/su_string.h"
 
 char const name[] = "sip_resolve";
 
@@ -121,7 +122,7 @@ void answer_to_naptr_query(sres_context_t *sr,
 
     switch (na->na_flags[0]) {
     case 's': /* srv */
-      if (strncasecmp("SIP+", na->na_services, 4))
+      if (!su_casenmatch("SIP+", na->na_services, 4))
        /* Something else but SIP */
        break;
       query_srv(sr, na->na_replace);
@@ -129,7 +130,7 @@ void answer_to_naptr_query(sres_context_t *sr,
       return;
 
     case 'a':
-      if (strncasecmp("SIP+", na->na_services, 4))
+      if (!su_casenmatch("SIP+", na->na_services, 4))
        /* Something else but SIP */
        break;
       query_a(sr, na->na_replace);

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
index 48e512c2fee230822f8af7ed7260f1c275a30911..2f96e0aab793b9fd52b28752c41eaf41d15a532c 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
@@ -83,6 +83,7 @@ typedef int socklen_t;
 
 #include <sofia-sip/su_alloc.h>
 #include <sofia-sip/su_strlst.h>
+#include <sofia-sip/su_string.h>
 #include <sofia-sip/su_errno.h>
 
 #include "sofia-sip/htable.h"
@@ -1572,8 +1573,8 @@ sres_record_compare(sres_record_t const *aa, sres_record_t const *bb)
     {
       sres_soa_record_t const *A = aa->sr_soa, *B = bb->sr_soa;
       D = A->soa_serial - B->soa_serial; if (D) return D;
-      D = strcasecmp(A->soa_mname, B->soa_mname); if (D) return D;
-      D = strcasecmp(A->soa_rname, B->soa_rname); if (D) return D;
+      D = su_strcasecmp(A->soa_mname, B->soa_mname); if (D) return D;
+      D = su_strcasecmp(A->soa_rname, B->soa_rname); if (D) return D;
       D = A->soa_refresh - B->soa_refresh; if (D) return D;
       D = A->soa_retry - B->soa_retry; if (D) return D;
       D = A->soa_expire - B->soa_expire; if (D) return D;
@@ -1591,7 +1592,7 @@ sres_record_compare(sres_record_t const *aa, sres_record_t const *bb)
       D = A->a6_prelen - B->a6_prelen; if (D) return D;
       D = !A->a6_prename - !B->a6_prename;
       if (D == 0 && A->a6_prename && B->a6_prename)
-       D = strcasecmp(A->a6_prename, B->a6_prename); if (D) return D;
+       D = su_strcasecmp(A->a6_prename, B->a6_prename); if (D) return D;
       return memcmp(&A->a6_suffix, &B->a6_suffix, sizeof A->a6_suffix);
     }
   case sres_type_aaaa:
@@ -2251,7 +2252,7 @@ int sres_parse_config(sres_config_t *c, FILE *f)
       len = strcspn(b, " \t");
       value = b + len; value += strspn(value, " \t");
 
-#define MATCH(token) (len == strlen(token) && strncasecmp(token, b, len) == 0)
+#define MATCH(token) (len == strlen(token) && su_casenmatch(token, b, len))
 
       if (MATCH("nameserver")) {
        if (sres_parse_nameserver(c, value) < 0)

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
index f050d67496b0df66eeb8f0d0b7b70f5dd5d5c1b2..053b52706270c0d756558f52cf32d690d26d8684 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
@@ -64,6 +64,7 @@ typedef unsigned _int32 uint32_t;
 
 #include <sofia-sip/su_alloc.h>
 #include <sofia-sip/su_strlst.h>
+#include <sofia-sip/su_string.h>
 #include <sofia-sip/htable.h>
 #include <sofia-sip/heap.h>
 
@@ -209,7 +210,7 @@ int sres_cache_get(sres_cache_t *cache,
        now <= (*rr_iter)->rr_expires &&
         (type == sres_qtype_any || rr->sr_type == type) &&
         rr->sr_name != NULL &&
-        strcasecmp(rr->sr_name, domain) == 0)
+        su_casematch(rr->sr_name, domain))
       rr_count++;
   }
 
@@ -236,7 +237,7 @@ int sres_cache_get(sres_cache_t *cache,
        now <= (*rr_iter)->rr_expires &&
         (type == sres_qtype_any || rr->sr_type == type) &&
         rr->sr_name != NULL &&
-        strcasecmp(rr->sr_name, domain) == 0) {
+        su_casematch(rr->sr_name, domain)) {
       SU_DEBUG_9(("rr found in cache: %s %02d\n",
                  rr->sr_name, rr->sr_type));
 
@@ -335,7 +336,7 @@ sres_cache_store(sres_cache_t *cache, sres_record_t *rr, time_t now)
     if (!!or->sr_name != !!rr->sr_name)
       continue;
     if (or->sr_name != rr->sr_name &&
-       strcasecmp(or->sr_name, rr->sr_name) != 0)
+       !su_casematch(or->sr_name, rr->sr_name))
       continue;
     if (rr->sr_type != sres_type_soa /* There can be only one */
        && sres_record_compare(or, rr))
@@ -526,13 +527,13 @@ int sres_cache_set_srv_priority(sres_cache_t *cache,
 
     if (rr && rr->sr_name &&
        sres_type_srv == rr->sr_type &&
-       strcasecmp(rr->sr_name, domain) == 0) {
+       su_casematch(rr->sr_name, domain)) {
 
       (*iter)->rr_expires = expires;
 
       if ((port == 0 || rr->sr_srv->srv_port == port) &&
          rr->sr_srv->srv_target &&
-         strcasecmp(rr->sr_srv->srv_target, target) == 0) {
+         su_casematch(rr->sr_srv->srv_target, target)) {
        /* record found --> change priority of server */
        rr->sr_srv->srv_priority = priority;
        ret++;