[asterisk-commits] trunk r15614 - in /trunk: acl.c doc/ip-tos.txt

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Mar 28 11:18:02 2006
New Revision: 15614

URL: http://svn.digium.com/view/asterisk?rev=15614&view=rev
Log:
Fix typo (thanks, North) and update docs for IP-tos settings

Modified:
    trunk/acl.c
    trunk/doc/ip-tos.txt

Modified: trunk/acl.c
URL: http://svn.digium.com/view/asterisk/trunk/acl.c?rev=15614&r1=15613&r2=15614&view=diff
==============================================================================
--- trunk/acl.c (original)
+++ trunk/acl.c Tue Mar 28 11:18:02 2006
@@ -313,7 +313,7 @@
 	else
 		return -1;
 
-	ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/ip-tos.txt for more information.", value);
+	ast_log(LOG_WARNING, "TOS value %s is deprecated. Please see doc/ip-tos.txt for more information.\n", value);
 
 	return 0;
 }

Modified: trunk/doc/ip-tos.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/ip-tos.txt?rev=15614&r1=15613&r2=15614&view=diff
==============================================================================
--- trunk/doc/ip-tos.txt (original)
+++ trunk/doc/ip-tos.txt Tue Mar 28 11:18:02 2006
@@ -4,42 +4,43 @@
 Asterisk can set the Type of Service (TOS) byte on outgoing IP packets
 for various protocols.  The TOS byte is used by the network to provide
 some level of Quality of Service (QoS) even if the network is
-congested with other traffic.  For more information on Quality of
-Service for VoIP networks see the "Enterprise QoS Solution Reference
-Network Design Guide" version 3.3 from Cisco at:
+congested with other traffic. 
 
-<http://www.cisco.com/application/pdf/en/us/guest/netsol/ns432/c649/ccmigration_09186a008049b062.pdf>
-
+* SIP
+-----
 In sip.conf, there are three parameters that control the TOS settings:
-tos_sip, tos_audio, and tos_video.  tos_sip controls what TOS SIP call
+"tos_sip", "tos_audio", and "tos_video".  tos_sip controls what TOS SIP call
 signalling packets are set to.  tos_audio controls what TOS RTP audio
 packets are set to.  tos_video controls what TOS RTP video packets are
-set to.  There is a "tos" parameter that is supported for backwards
+set to.  
+There is a "tos" parameter that is supported for backwards
 compatibility.  The tos parameter should be avoided in sip.conf
 because it sets all three tos settings in sip.conf to the same value.
 
-In iax.conf, there is a tos parameter that sets the global default TOS
+* IAX2
+------
+In iax.conf, there is a "tos" parameter that sets the global default TOS
 for IAX packets generated by chan_iax2.  Since IAX connections combine
 signalling, audio, and video into one UDP stream, it is not possible
 to set the TOS separately for the different types of traffic.
 
-In iaxprov.conf, there is a tos parameter that tells the IAXy what TOS
+In iaxprov.conf, there is a "tos" parameter that tells the IAXy what TOS
 to set on packets it generates.  As with the parameter in iax.conf,
 IAX packets generated by an IAXy cannot have different TOS settings
 based upon the type of packet.  However different IAXy devices can
 have different TOS settings.
 
 The allowable values for any of the tos* parameters are:
-
-be (best effort), cs1, af11, af12, af13, cs2, af21, af22, af23, cs3,
-af31, af32, af33, cs4, af41, af42, af42, ef (expedited forwarding),
-lowdelay, throughput, reliability, mincost, none
+CS0, CS1, CS2, CS3, CS4, CS5, CS6, CS7, AF11, AF12, AF13,
+AF21, AF22, AF23, AF31, AF32, AF33, AF41, AF42, AF43 and
+ef (expedited forwarding),
 
 The tos* parameters also take numeric values.
 
 The lowdelay, throughput, reliability, mincost, and none values are
 deprecated because they set the IP TOS using the outdated "IP
-prececence" model as defined in RFC 791 and RFC 1349.
+prececence" model as defined in RFC 791 and RFC 1349. They still
+work in this version of Asterisk, but will be removed in future releases.
 
 ===========================================
 Configuation	Parameter	Recommended
@@ -54,6 +55,17 @@
 iaxprov.conf	tos		ef
 ===========================================
 
+
+* REFERENCE
+-----------
+RFC 2474 - "Definition of the Differentiated Services Field
+(DS field) in the IPv4 and IPv6 Headers", Nichols, K., et al,
+December 1998.
+
+IANA Assignments, DSCP registry
+Differentiated Services Field Codepoints
+http://www.iana.org/assignments/dscp-registry
+
 To get the most out of setting the TOS on packets generated by
 Asterisk, you will need to ensure that your network handles packets
 with a TOS properly.  For Cisco devices, see the previously mentioned
@@ -61,3 +73,9 @@
 systems see the "Linux Advanced Routing & Traffic Control HOWTO" at
 <http://www.lartc.org/>.
 
+For more information on Quality of
+Service for VoIP networks see the "Enterprise QoS Solution Reference
+Network Design Guide" version 3.3 from Cisco at:
+
+<http://www.cisco.com/application/pdf/en/us/guest/netsol/ns432/c649/ccmigration_09186a008049b062.pdf>
+