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

Tue Jul 7 19:00:00 CDT 2009 Pekka Pessi <first.last@nokia.com> 

* nua_session.c: made INFO a general-purpose method


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14186 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-07-10 00:48:06 +00:00
parent 919d20d9d7
commit aefcb7d0a0
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Thu Jul 9 19:44:05 CDT 2009 Thu Jul 9 19:46:28 CDT 2009

25
libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
View File

@ -275,7 +275,7 @@ void nua_session_usage_remove(nua_handle_t *nh,
if (cr->cr_status < 200) { if (cr->cr_status < 200) {
nua_stack_event(nh->nh_nua, nh, nua_stack_event(nh->nh_nua, nh,
NULL, NULL,
cr->cr_event, (enum nua_event_e)cr->cr_event,
SIP_481_NO_TRANSACTION, SIP_481_NO_TRANSACTION,
NULL); NULL);
} }
@ -696,7 +696,6 @@ nua_client_methods_t const nua_invite_client_methods = {
extern nua_client_methods_t const nua_bye_client_methods; extern nua_client_methods_t const nua_bye_client_methods;
extern nua_client_methods_t const nua_cancel_client_methods; extern nua_client_methods_t const nua_cancel_client_methods;
extern nua_client_methods_t const nua_info_client_methods;
extern nua_client_methods_t const nua_update_client_methods; extern nua_client_methods_t const nua_update_client_methods;
extern nua_client_methods_t const nua_prack_client_methods; extern nua_client_methods_t const nua_prack_client_methods;
@ -1029,7 +1028,7 @@ static int nua_invite_client_report(nua_client_request_t *cr,
nua_stack_event(nh->nh_nua, nh, nua_stack_event(nh->nh_nua, nh,
response, response,
cr->cr_event, (enum nua_event_e)cr->cr_event,
status, phrase, status, phrase,
tags); tags);
@ -1146,7 +1145,7 @@ static int nua_invite_client_report(nua_client_request_t *cr,
ss->ss_reporting = 0; ss->ss_reporting = 0;
signal_call_state_change(nh, ss, status, phrase, next_state); signal_call_state_change(nh, ss, status, phrase, (enum nua_callstate)next_state);
msg_destroy(response); msg_destroy(response);
@ -1847,7 +1846,7 @@ static int nua_prack_client_report(nua_client_request_t *cr,
nua_stack_event(nh->nh_nua, nh, nua_stack_event(nh->nh_nua, nh,
nta_outgoing_getresponse(orq), nta_outgoing_getresponse(orq),
cr->cr_event, (enum nua_event_e)cr->cr_event,
status, phrase, status, phrase,
tags); tags);
@ -1878,7 +1877,7 @@ static int nua_prack_client_report(nua_client_request_t *cr,
} }
} }
signal_call_state_change(nh, ss, status, phrase, next_state); signal_call_state_change(nh, ss, status, phrase, (enum nua_callstate)next_state);
} }
if (acked && if (acked &&
@ -3085,12 +3084,12 @@ nua_client_methods_t const nua_info_client_methods = {
0, /* crm_extra */ 0, /* crm_extra */
{ /* crm_flags */ { /* crm_flags */
/* create_dialog */ 0, /* create_dialog */ 0,
/* in_dialog */ 0, /* in_dialog */ 1,
/* target refresh */ 0 /* target refresh */ 0
}, },
NULL, /* crm_template */ NULL, /* crm_template */
NULL, /* crm_init */ NULL, /* crm_init */
NULL, /* crm_send */ NULL, /* crm_send */
NULL, /* crm_check_restart */ NULL, /* crm_check_restart */
NULL, /* crm_recv */ NULL, /* crm_recv */
NULL, /* crm_preliminary */ NULL, /* crm_preliminary */
@ -3147,7 +3146,7 @@ nua_server_methods_t const nua_info_server_methods =
nua_i_info, /* Event */ nua_i_info, /* Event */
{ {
0, /* Do not create dialog */ 0, /* Do not create dialog */
0, /* In-dialog request */ 0, /* Allow outside dialog, too */
0, /* Not a target refresh request */ 0, /* Not a target refresh request */
0, /* Do not add Contact */ 0, /* Do not add Contact */
}, },
@ -3388,7 +3387,7 @@ static int nua_update_client_report(nua_client_request_t *cr,
nua_stack_event(nh->nh_nua, nh, nua_stack_event(nh->nh_nua, nh,
nta_outgoing_getresponse(orq), nta_outgoing_getresponse(orq),
cr->cr_event, (enum nua_event_e)cr->cr_event,
status, phrase, status, phrase,
tags); tags);
@ -3416,7 +3415,7 @@ static int nua_update_client_report(nua_client_request_t *cr,
} }
} }
signal_call_state_change(nh, ss, status, phrase, next_state); signal_call_state_change(nh, ss, status, phrase, (enum nua_callstate)next_state);
} }
return 1; return 1;
@ -3799,7 +3798,7 @@ static int nua_bye_client_report(nua_client_request_t *cr,
nua_stack_event(nh->nh_nua, nh, nua_stack_event(nh->nh_nua, nh,
nta_outgoing_getresponse(orq), nta_outgoing_getresponse(orq),
cr->cr_event, (enum nua_event_e)cr->cr_event,
status, phrase, status, phrase,
tags); tags);