[asterisk-commits] dvossel: branch 1.6.2 r282894 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Aug 19 16:05:54 2010
New Revision: 282894

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282894
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_sip.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Aug 19 16:05:54 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729
+/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=282894&r1=282893&r2=282894
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Thu Aug 19 16:05:54 2010
@@ -25173,6 +25173,8 @@
 				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",