diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-08 22:15:34 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-08 22:15:34 +0000 |
| commit | 849e6a23aaabc272579e88c37262242b4d908788 (patch) | |
| tree | cf36c978626254ea449023522cd70cde35bc5981 | |
| parent | c09d27b722c895c30e095960ba12f74494734d36 (diff) | |
Merged revisions 285568 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r285568 | dvossel | 2010-09-08 17:14:19 -0500 (Wed, 08 Sep 2010) | 16 lines
Merged revisions 285567 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r285567 | dvossel | 2010-09-08 17:11:28 -0500 (Wed, 08 Sep 2010) | 9 lines
Merged revisions 285566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r285566 | dvossel | 2010-09-08 17:07:31 -0500 (Wed, 08 Sep 2010) | 2 lines
In retrans_pkt, do not unlock pvt until the end of the function on a transmit failure.
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@285569 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 81309d19d..d877dea9b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3357,7 +3357,6 @@ static int retrans_pkt(const void *data) append_history(pkt->owner, "ReTx", "%d %s", reschedule, pkt->data->str); xmitres = __sip_xmit(pkt->owner, pkt->data, pkt->packetlen); - sip_pvt_unlock(pkt->owner); /* If there was no error during the network transmission, schedule the next retransmission, * but if the next retransmission is going to be beyond our timeout period, mark the packet's @@ -3369,6 +3368,7 @@ static int retrans_pkt(const void *data) pkt->retrans_stop = 1; reschedule = diff; } + sip_pvt_unlock(pkt->owner); return reschedule; } } |