[asterisk-commits] dvossel: branch 1.8 r282895 - in /branches/1.8: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Aug 19 16:07:20 2010
New Revision: 282895

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

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

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=282895&r1=282894&r2=282895
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Thu Aug 19 16:07:20 2010
@@ -26946,6 +26946,8 @@
 				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);