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

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

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

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

diff --git a/libs/sofia-sip/libsofia-sip-ua/nea/nea.c b/libs/sofia-sip/libsofia-sip-ua/nea/nea.c
index 3e1cfb863ef45129e06293c406da3c95cd8fd7f4..1f58a18e10f7f17f761132d1322cf48d26d08d50 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nea/nea.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nea/nea.c
@@ -39,6 +39,7 @@
 #include <assert.h>
 
 #include <sofia-sip/su_tagarg.h>
+#include <sofia-sip/su_string.h>
 
 #include <sofia-sip/sip.h>
 #include <sofia-sip/sip_header.h>
@@ -518,14 +519,14 @@ int handle_notify(nea_t *nea,
   nea->nea_notify_received = 1;
   nea->nea_callback(nea, nea->nea_context, sip);
 
-  if (strcasecmp(ss->ss_substate, "terminated") == 0) {
+  if (su_casematch(ss->ss_substate, "terminated")) {
     nta_leg_destroy(nea->nea_leg), nea->nea_leg = NULL;
     nea->nea_state = nea_terminated;
 
-    if (str0casecmp(ss->ss_reason, "deactivated") == 0) {
+    if (su_casematch(ss->ss_reason, "deactivated")) {
       nea->nea_state = nea_embryonic;
       nea->nea_deadline = sip_now();
-    } else if (str0casecmp(ss->ss_reason, "probation") == 0) {
+    } else if (su_casematch(ss->ss_reason, "probation")) {
       sip_time_t retry = sip_now() + NEA_TIMER_DELTA;
 
       if (ss->ss_retry_after)
@@ -541,9 +542,9 @@ int handle_notify(nea_t *nea,
       return 200;
     }
   }
-  else if (strcasecmp(ss->ss_substate, "pending") == 0)
+  else if (su_casematch(ss->ss_substate, "pending"))
     nea->nea_state = nea_pending;
-  else if (strcasecmp(ss->ss_substate, "active") == 0)
+  else if (su_casematch(ss->ss_substate, "active"))
     nea->nea_state = nea_active;
   else
     nea->nea_state = nea_extended;

diff --git a/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c b/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
index b726954f809af8d8d20ae085ecf68aae0ea416f3..debb9b716a9b1952afb87efb0079711cafb0f770 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
@@ -752,7 +752,7 @@ int nea_view_update(nea_server_t *nes,
 
     /* Check if the payload type already exists */
     for (i = 0; (evv = ev->ev_views[i]); i++)
-      if (str0casecmp(cts, evv->evv_content_type->c_type) == 0)
+      if (su_casematch(cts, evv->evv_content_type->c_type))
        break;
 
     if (private && evv == NULL) /* No private view without primary view. */
@@ -916,7 +916,7 @@ nea_event_view_t *nea_event_view(nea_event_t *ev, char const *content_type)
 
   /* Check if the payload type already exists */
   for (i = 0; ev->ev_views[i]; i++)
-    if (str0casecmp(content_type, ev->ev_views[i]->evv_content_type->c_type) == 0)
+    if (su_casematch(content_type, ev->ev_views[i]->evv_content_type->c_type))
       break;
 
   for (evv = ev->ev_views[i]; evv; evv = evv->evv_next)
@@ -1805,10 +1805,10 @@ int nea_sub_process_subscribe(nea_sub_t *s,
 
        type = evv->evv_content_type->c_type;
 
-       if ((strcasecmp(ac->ac_type, type) == 0) ||
-           (strcasecmp(ac->ac_subtype, "*") == 0 &&
-            strncasecmp(ac->ac_type, type,
-                        ac->ac_subtype - ac->ac_type) == 0)) {
+       if ((su_casematch(ac->ac_type, type)) ||
+           (su_casematch(ac->ac_subtype, "*") &&
+            su_casenmatch(ac->ac_type, type,
+                        ac->ac_subtype - ac->ac_type))) {
          if (evv_maybe == NULL)
            evv_maybe = evv;
        }
@@ -2290,7 +2290,7 @@ int nea_sub_auth(nea_sub_t *s,
 
   tl_gets(ta_args(ta), NEATAG_REASON_REF(reason), TAG_END());
 
-  rejected = reason && strcasecmp(reason, "rejected") == 0;
+  rejected = su_casematch(reason, "rejected");
 
   if (state == nea_terminated && embryonic && rejected && s->s_irq)
     retval = 0, s->s_rejected = 1;