Author: mikej Date: Wed Sep 3 14:32:12 2008 New Revision: 9422 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c Log: Wed Sep 3 14:21:06 EDT 2008 Pekka Pessi <first.last@nokia.com> * nua: using nua_client_set_terminating() Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Sep 3 14:32:12 2008 @@ -1 +1 @@ -Wed Sep 3 14:29:36 EDT 2008 +Wed Sep 3 14:31:22 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h Wed Sep 3 14:32:12 2008 @@ -564,9 +564,9 @@ } /** 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); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Wed Sep 3 14:32:12 2008 @@ -696,7 +696,7 @@ #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 @@ 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; } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c Wed Sep 3 14:32:12 2008 @@ -338,7 +338,7 @@ 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) { Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Wed Sep 3 14:32:12 2008 @@ -645,7 +645,7 @@ 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 @@ 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 @@ break; /* All contacts have expires=0 */ if (m == NULL) - nua_client_terminating(cr); + nua_client_set_terminating(cr, 1); } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Wed Sep 3 14:32:12 2008 @@ -1966,7 +1966,7 @@ * * @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 @@ 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 @@ } if (terminating) - cr->cr_terminating = terminating; + nua_client_set_terminating(cr, terminating); if (nua_client_request_queue(cr)) return 0; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c Wed Sep 3 14:32:12 2008 @@ -250,7 +250,7 @@ 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 @@ 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 @@ 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,