[svn-commits] dvossel: branch 1.4 r282893 - /branches/1.4/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Aug 19 16:03:24 2010
New Revision: 282893

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

Modified: branches/1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=282893&r1=282892&r2=282893
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Thu Aug 19 16:03:24 2010
@@ -18916,6 +18916,8 @@
 					ast_log(LOG_WARNING, "Unable to set SIP TOS to %s\n", ast_tos2str(global_tos_sip));
 			}
 		}
+	} else if (setsockopt(sipsock, IPPROTO_IP, IP_TOS, &global_tos_sip, sizeof(global_tos_sip))) {
+		ast_log(LOG_WARNING, "Unable to set SIP TOS to %s\n", ast_tos2str(global_tos_sip));
 	}
 	ast_mutex_unlock(&netlock);