Thu Jan 8 14:29:39 CST 2009 Pekka Pessi <first.last@nokia.com>

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

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

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 1f87ee106efa8c553851d010a9cd34005be83e58..3757f84de57a035eb94fae86f0d90508c2e664f9 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Feb 11 10:47:59 CST 2009
+Wed Feb 11 10:48:33 CST 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c b/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c
index 59c9398414af9905d3b1772cfacea18baa44535f..22eb5b9bbdf1f9cc27f8184ff3ad134cd0443c3d 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c
@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <sofia-sip/string0.h>
+#include <sofia-sip/su_string.h>
 
 /** @internal SU message argument structure type */
 #define SU_MSG_ARG_T   union sm_arg_u
@@ -753,7 +753,7 @@ url_string_t const *hc_request_complete(nth_client_t * hc,
 
   if (host &&
       (host_cmp(host->h_host, u->url_host) ||
-       str0cmp(host->h_port, u->url_port)))
+       su_strcmp(host->h_port, u->url_port)))
     host = NULL;
 
   if (host == NULL && u->url_host) {
@@ -777,7 +777,7 @@ url_string_t const *hc_request_complete(nth_client_t * hc,
     else if (rq && name && strcmp(name, rq->rq_method_name))
       rq = NULL;
 
-    if (rq && version && strcasecmp(version, rq->rq_version))
+    if (rq && version && !su_casematch(version, rq->rq_version))
       rq = NULL;
 
     if (!hc->hc_route_url) {

diff --git a/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c b/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c
index 3ee91c21e9bf62bc34b5495b04076e5a8284eeeb..6dfdb7a18b89a34c5e67c79b4a19b59f176538db 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c
@@ -32,7 +32,7 @@
 
 #include "config.h"
 
-#include <sofia-sip/string0.h>
+#include <sofia-sip/su_string.h>
 #include <sofia-sip/su.h>
 
 typedef struct server_s server_t;
@@ -592,7 +592,7 @@ nth_site_t **site_get_host(nth_site_t **list, char const *host, char const *port
 
   for (; (site = *list); list = &site->site_next) {
     if (host_cmp(host, site->site_url->url_host) == 0 &&
-       str0cmp(port, site->site_url->url_port) == 0) {
+       su_strcmp(port, site->site_url->url_port) == 0) {
       break;
     }
   }