kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-02 03:24:54 +00:00
Code Issues Projects Releases Wiki Activity

Thu May 22 10:57:40 EDT 2008 Pekka.Pessi@nokia.com

Browse Source 
* nua_register.c: fixed klocwork issues


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8640 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-25 15:23:36 +00:00
parent 17b5b79f14
commit d886447645
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Sun May 25 11:23:06 EDT 2008 Sun May 25 11:23:32 EDT 2008

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

@ -188,7 +188,7 @@ static int nua_register_usage_add(nua_handle_t *nh,
nua_dialog_state_t *ds, nua_dialog_state_t *ds,
nua_dialog_usage_t *du) nua_dialog_usage_t *du)
{ {
nua_registration_t *nr = nua_dialog_usage_private(du); nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
if (ds->ds_has_register) if (ds->ds_has_register)
return -1; /* There can be only one usage */ return -1; /* There can be only one usage */
@ -207,7 +207,7 @@ static void nua_register_usage_remove(nua_handle_t *nh,
nua_client_request_t *cr, nua_client_request_t *cr,
nua_server_request_t *sr) nua_server_request_t *sr)
{ {
nua_registration_t *nr = nua_dialog_usage_private(du); nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
if (nr->nr_list) if (nr->nr_list)
nua_registration_remove(nr); /* Remove from list of registrations */ nua_registration_remove(nr); /* Remove from list of registrations */
@ -236,7 +236,7 @@ static void nua_register_usage_peer_info(nua_dialog_usage_t *du,
nua_dialog_state_t const *ds, nua_dialog_state_t const *ds,
sip_t const *sip) sip_t const *sip)
{ {
nua_registration_t *nr = nua_dialog_usage_private(du); nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
if (nr->nr_ob) if (nr->nr_ob)
outbound_peer_info(nr->nr_ob, sip); outbound_peer_info(nr->nr_ob, sip);
} }
@ -1016,16 +1016,18 @@ void nua_register_connection_closed(tp_stack_t *sip_stack,
msg_t *msg, msg_t *msg,
int error) int error)
{ {
nua_dialog_usage_t *du = nua_dialog_usage_public(nr); nua_dialog_usage_t *du;
tp_name_t const *tpn; tp_name_t const *tpn;
int pending = nr->nr_error_report_id; int pending;
assert(tport == nr->nr_tport); assert(nr && tport == nr->nr_tport);
if (nr == NULL || tport != nr->nr_tport)
if (!nr->nr_tport)
return; return;
if (tport_release(nr->nr_tport, pending, NULL, NULL, nr, 0) < 0) du = NUA_DIALOG_USAGE_PUBLIC(nr);
pending = nr->nr_error_report_id;
if (tport_release(tport, pending, NULL, NULL, nr, 0) < 0)
SU_DEBUG_1(("nua_register: tport_release() failed\n")); SU_DEBUG_1(("nua_register: tport_release() failed\n"));
nr->nr_error_report_id = 0; nr->nr_error_report_id = 0;
@ -1110,7 +1112,7 @@ static int nua_register_usage_shutdown(nua_handle_t *nh,
nua_dialog_usage_t *du) nua_dialog_usage_t *du)
{ {
nua_client_request_t *cr = du->du_cr; nua_client_request_t *cr = du->du_cr;
nua_registration_t *nr = nua_dialog_usage_private(du); nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du);
if (cr) { if (cr) {
if (nua_client_is_queued(cr)) /* Already registering. */ if (nua_client_is_queued(cr)) /* Already registering. */