From 85cafb105d4eec68b4a56413d9dd333017c549d7 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 11 Feb 2009 16:45:51 +0000 Subject: [PATCH] Thu Jan 8 12:13:38 CST 2009 Pekka Pessi * su: using git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11792 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c | 3 ++- libs/sofia-sip/libsofia-sip-ua/su/su_port.c | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 7538a81de9..13a99ffa98 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Wed Feb 11 10:27:42 CST 2009 +Wed Feb 11 10:45:40 CST 2009 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c index 1a0dbc1727..5436c9429b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c @@ -41,6 +41,7 @@ #include #include +#include #include "su_module_debug.h" #include @@ -1600,7 +1601,7 @@ int li_name(su_localinfo_t const *hints, return ELI_RESOLVER; } - if (hints->li_canonname && strcasecmp(name, hints->li_canonname)) + if (hints->li_canonname && !su_casematch(name, hints->li_canonname)) return 1; if (!(flags & LI_CANONNAME)) diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_port.c b/libs/sofia-sip/libsofia-sip-ua/su/su_port.c index 17f37fa2a3..422e72482c 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_port.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_port.c @@ -139,7 +139,7 @@ void su_port_set_system_preferences(char const *name) } #endif #if HAVE_WIN32 - else if (strcasecmp(name, "wsaevent") == 0) { + else if (su_casematch(name, "wsaevent")) { create = su_wsaevent_port_create; start = su_wsaevent_clone_start; } diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c b/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c index 5b699425c0..03d4f6f6a3 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c @@ -57,6 +57,7 @@ #include #include #include +#include #ifndef HAVE_STRTOULL unsigned longlong strtoull(const char *, char **, int); @@ -1399,10 +1400,10 @@ int t_bool_scan(tag_type_t tt, su_home_t *home, int retval; int value = 0; - if (strncasecmp(s, "true", 4) == 0 + if (su_casenmatch(s, "true", 4) && strlen(s + 4) == strspn(s + 4, " \t\r\n")) { value = 1, retval = 1; - } else if (strncasecmp(s, "false", 5) == 0 + } else if (su_casenmatch(s, "false", 5) && strlen(s + 5) == strspn(s + 5, " \t\r\n")) { value = 0, retval = 1; } else {