From: David Vossel <dvossel@digium.com>
Date: Thu, 19 Aug 2010 21:05:54 +0000 (+0000)
Subject: Merged revisions 282893 via svnmerge from
X-Git-Tag: 1.6.2.12-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c74e4511de9516f9b7201dfd67ff25ef151798b0;p=thirdparty%2Fasterisk.git

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/branches/1.6.2@282894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5503bfe708..89cfe8f12a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -25173,6 +25173,8 @@ static int reload_config(enum channelreloadreason reason)
 				ast_netsock_set_qos(sipsock, global_tos_sip, global_cos_sip, "SIP");
 			}
 		}
+	} else {
+		ast_netsock_set_qos(sipsock, global_tos_sip, global_cos_sip, "SIP");
 	}
 	if (stunaddr.sin_addr.s_addr != 0) {
 		ast_debug(1, "stun to %s:%d\n",