Author: mikej Date: Wed Feb 11 10:48:40 2009 New Revision: 11798 Log: Thu Jan 8 14:29:39 CST 2009 Pekka Pessi <first.last@nokia.com> * nth: using <sofia-sip/su_string.h> functions Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:48:40 2009 @@ -1 +1 @@ -Wed Feb 11 10:47:59 CST 2009 +Wed Feb 11 10:48:33 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c Wed Feb 11 10:48:40 2009 @@ -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 @@ 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 @@ 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) { Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c Wed Feb 11 10:48:40 2009 @@ -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 @@ 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; } }