Merged revisions 282895 via svnmerge from

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