Module: sems Branch: master Commit: 730d62eb0f47e99b4df373a1c43b9091462e58d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=730d62eb0f47e99b4df373a1c43b9091462e58d4
Author: Václav Kubart <[email protected]> Committer: Raphael Coeffic <[email protected]> Date: Tue Jan 15 08:01:02 2013 +0100 transaction deadlock: quick attempt to avoid deadlock --- core/sip/sip_trans.cpp | 1 + core/sip/trans_layer.cpp | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/core/sip/sip_trans.cpp b/core/sip/sip_trans.cpp index fee50c8..f9391dc 100644 --- a/core/sip/sip_trans.cpp +++ b/core/sip/sip_trans.cpp @@ -180,6 +180,7 @@ void trans_timer::fire() // 1. it is not yet deleted in the wheeltimer // 2. we have already set a new one // -> anyway, don't fire the old one !!! + bucket->unlock(); return; } diff --git a/core/sip/trans_layer.cpp b/core/sip/trans_layer.cpp index 7a0e195..2197062 100644 --- a/core/sip/trans_layer.cpp +++ b/core/sip/trans_layer.cpp @@ -1179,6 +1179,7 @@ int _trans_layer::cancel(trans_ticket* tt, const cstring& hdrs) ERROR("Parser failed on generated request\n"); ERROR("Message was: <%.*s>\n",p_msg->len,p_msg->buf); delete p_msg; + bucket->unlock(); return MALFORMED_SIP_MSG; } _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
