Wed Sep 3 14:21:06 EDT 2008 Pekka Pessi <first.last@nokia.com>

  * nua: using nua_client_set_terminating()

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

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 2e1c7e10ced19fd5697c8020062d8808509c123c..3e7e9c58f91bace72e00490074e371ea111a477c 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Sep  3 14:29:36 EDT 2008
+Wed Sep  3 14:31:22 EDT 2008

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h b/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h
index 9ea52f8cf33d85071f02f42c873acd2561f5dd5d..04b75a83f1a9ffc5add4deb9486febb822ec7887 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h
@@ -564,9 +564,9 @@ su_inline int nua_client_is_reporting(nua_client_request_t const *cr)
 }
 
 /** Mark client request as a terminating one */
-su_inline void nua_client_terminating(nua_client_request_t *cr)
+su_inline void nua_client_set_terminating(nua_client_request_t *cr, int value)
 {
-  cr->cr_terminating = 1;
+  cr->cr_terminating = value != 0;
 }
 
 int nua_client_init_request(nua_client_request_t *cr);

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c
index f07be72d8370cf257bd96f6d381722424da5b9a5..4a204bc8bc4a8061526c9333f803a140273ab4ad 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c
@@ -696,7 +696,7 @@ int nua_notify_client_request(nua_client_request_t *cr,
 #endif
 
   if (nu->nu_substate == nua_substate_terminated)
-    cr->cr_terminating = 1;
+    nua_client_set_terminating(cr, 1);
 
   if (cr->cr_terminating) {
     nua_server_request_t *sr;
@@ -704,7 +704,7 @@ int nua_notify_client_request(nua_client_request_t *cr,
       if (sr->sr_usage == du) {
        /* If subscribe has not been responded, don't terminate usage by NOTIFY */
        sr->sr_terminating = 1;
-       cr->cr_terminating = 0;
+       nua_client_set_terminating(cr, 0);
        break;
       }
     }

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c
index 1886533719b148f85d04e4f69c5078f239437def..f12b2cdf4c73710ba5b7d874a01b3ccd14767dea 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c
@@ -338,7 +338,7 @@ int nua_publish_client_request(nua_client_request_t *cr,
     cr->cr_event != nua_r_publish ||
     (du && du->du_shutdown) ||
     (sip->sip_expires && sip->sip_expires->ex_delta == 0);
-  cr->cr_terminating = un;
+  nua_client_set_terminating(cr, un);
   done = un;
 
   if (du) {

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c
index 945839a2c1b9caf46d3d421d6eb9a600d1fa645d..47d7d8c0588a66948d747e99a2ff0d985bcb710a 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c
@@ -645,7 +645,7 @@ static int nua_register_client_init(nua_client_request_t *cr,
   unreg = cr->cr_event != nua_r_register ||
     (sip->sip_expires && sip->sip_expires->ex_delta == 0);
   if (unreg)
-    nua_client_terminating(cr);
+    nua_client_set_terminating(cr, 1);
 
   du = nua_dialog_usage_add(nh, nh->nh_ds, nua_register_usage, NULL);
   if (du == NULL)
@@ -725,7 +725,7 @@ int nua_register_client_request(nua_client_request_t *cr,
 
   if ((du && du->du_shutdown) ||
       (sip->sip_expires && sip->sip_expires->ex_delta == 0))
-    nua_client_terminating(cr);
+    nua_client_set_terminating(cr, 1);
 
   if (contacts) {
     if (!cr->cr_terminating) {
@@ -734,7 +734,7 @@ int nua_register_client_request(nua_client_request_t *cr,
          break;
       /* All contacts have expires=0 */
       if (m == NULL)
-       nua_client_terminating(cr);
+       nua_client_set_terminating(cr, 1);
     }
   }
 

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
index 9a1668ce9f32c7f13f11e9b7f9530dab0f76af81..59675129b6757fb40a399909d7208f92588a5313 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
@@ -1966,7 +1966,7 @@ int nua_base_server_report(nua_server_request_t *sr, tagi_t const *tags)
  *
  * @par Terminating Dialog Usages and Dialogs
  *
- * The response can be marked as terminating with nua_client_terminating(). 
+ * The response is marked as terminating with nua_client_set_terminating(). 
  * When a terminating request completes the dialog usage is removed and the
  * dialog is destroyed (unless there is an another active usage).
  */
@@ -2499,7 +2499,7 @@ int nua_client_restart_request(nua_client_request_t *cr,
       if (sip_add_tagis(cr->cr_msg, NULL, &tags) < 0)
        /* XXX */;
 
-    cr->cr_terminating = terminating;
+    nua_client_set_terminating(cr, terminating);
 
     return nua_client_request_try(cr);
   }
@@ -2528,7 +2528,7 @@ int nua_client_resend_request(nua_client_request_t *cr,
     }
 
     if (terminating)
-      cr->cr_terminating = terminating;
+      nua_client_set_terminating(cr, terminating);
 
     if (nua_client_request_queue(cr))
       return 0;

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c
index 70934c7bbe7ebcf42384b42adbedb75b3c1e581b..13de556851319fdeb0d2f668810513f080b6ce2e 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c
@@ -250,7 +250,7 @@ static int nua_subscribe_client_request(nua_client_request_t *cr,
   sip_time_t expires = 0;
 
   if (cr->cr_event == nua_r_destroy || !du || du->du_shutdown)
-    cr->cr_terminating = 1;
+    nua_client_set_terminating(cr, 1);
 
   if (du) {
     struct event_usage *eu = nua_dialog_usage_private(du);
@@ -353,7 +353,7 @@ static int nua_subscribe_client_response(nua_client_request_t *cr,
                                         sip_t const *sip)
 {
   nua_handle_t *nh = cr->cr_owner;
-  nua_dialog_usage_t *du = cr->cr_usage; 
+  nua_dialog_usage_t *du = cr->cr_usage;
   struct event_usage *eu = nua_dialog_usage_private(du);
   enum nua_substate substate;
 
@@ -415,7 +415,7 @@ static int nua_subscribe_client_response(nua_client_request_t *cr,
 
     if (substate == nua_substate_terminated)
       /* let nua_base_client_tresponse to remove usage */
-      cr->cr_terminated = 1;   
+      cr->cr_terminated = 1;
   }
 
   return nua_base_client_tresponse(cr, status, phrase, sip,