diff options
author | David Vossel <dvossel@digium.com> | 2010-08-19 21:08:39 +0000 |
---|---|---|
committer | David Vossel <dvossel@digium.com> | 2010-08-19 21:08:39 +0000 |
commit | 5ef8140eb2662892679d5f1ddde0f3732de03768 (patch) | |
tree | 362a0d3d4ceb0f3acc93678b1f64cea44f48074e /channels | |
parent | da683f0cc0ce4fe3b683a703dfe6cfe8eaefd38e (diff) |
Merged revisions 282895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r282895 | dvossel | 2010-08-19 16:07:20 -0500 (Thu, 19 Aug 2010) | 25 lines
Merged revisions 282894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r282894 | dvossel | 2010-08-19 16:05:54 -0500 (Thu, 19 Aug 2010) | 18 lines
Merged revisions 282893 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r282893 | dvossel | 2010-08-19 16:03:24 -0500 (Thu, 19 Aug 2010) | 11 lines
tos_sip option was not being set correctly
When tos_sip is used, the tos of the sip socket is only set
correctly if the socket binding changes on a reload. If the binding
stays the same but the TOS changes, the new tos value would not take
into effect. This patch fixes that.
(closes issue #17712)
Reported by: nickb
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 001c40d92..340ac0dff 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -26978,6 +26978,8 @@ static int reload_config(enum channelreloadreason reason) ast_set_qos(sipsock, global_tos_sip, global_cos_sip, "SIP"); } } + } else { + ast_set_qos(sipsock, global_tos_sip, global_cos_sip, "SIP"); } ast_mutex_unlock(&netlock); |