kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-13 07:45:26 +00:00
Code Issues Projects Releases Wiki Activity

Wed Apr 8 16:37:43 CDT 2009 Pekka Pessi <first.last@nokia.com>

Browse Source 
* nua_session.c: do not restart CANCEL requests
  Ignore-this: 2c9d51bbafca2256630a0ea73982abea
  
  Fixes FreesWitch bug SFSIP-134, reported by vile, initial patch by Mike
  Jerris.



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13061 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-04-16 15:00:42 +00:00
parent 08413526f3
commit 5278050e61
2 changed files with 17 additions and 3 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 Apr 16 09:59:45 CDT 2009
Thu Apr 16 10:00:29 CDT 2009

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

@ -1436,6 +1436,10 @@ static int nua_invite_client_complete(nua_client_request_t *cr)
static int nua_cancel_client_request(nua_client_request_t *cr,
msg_t *msg, sip_t *sip,
tagi_t const *tags);
static int nua_cancel_client_check_restart(nua_client_request_t *cr,
int status,
char const *phrase,
sip_t const *sip);
nua_client_methods_t const nua_cancel_client_methods = {
SIP_METHOD_CANCEL, /* crm_method, crm_method_name */
@ -1447,8 +1451,8 @@ nua_client_methods_t const nua_cancel_client_methods = {
},
NULL, /* crm_template */
NULL, /* crm_init */
nua_cancel_client_request, /* crm_send */
NULL, /* crm_check_restart */
nua_cancel_client_request, /* .. not really crm_send */
nua_cancel_client_check_restart, /* crm_check_restart */
NULL, /* crm_recv */
NULL, /* crm_preliminary */
NULL, /* crm_report */
@ -1488,6 +1492,16 @@ static int nua_cancel_client_request(nua_client_request_t *cr,
return 0;
}
static int
nua_cancel_client_check_restart(nua_client_request_t *cr,
int status,
char const *phrase,
sip_t const *sip)
{
/* We cannot really restart CANCEL */
return 0;
}
/** @NUA_EVENT nua_r_cancel
*
* Answer to outgoing CANCEL.