kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Michael Jerris 2008-09-03 18:32:12 +00:00
parent ef020e6016
commit 04855d3cc0
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Sep 3 14:29:36 EDT 2008
Wed Sep 3 14:31:22 EDT 2008

4
libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h
View File

@ -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);

4
libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c
View File

@ -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;
}
}

2
libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c
View File

@ -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) {

6
libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c
View File

@ -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);
}
}

6
libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
View File

@ -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;

6
libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c
View File

@ -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,