From 2db4fe1ba02d36ce9b81b5207c50f29aa638a60e Mon Sep 17 00:00:00 2001 From: dvossel Date: Thu, 19 Aug 2010 21:08:39 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/trunk@282896 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'channels/chan_sip.c') 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); -- cgit v1.2.3