Allow TC_TYPE=CBQ setting for backwards compatibility, although
it is ignored. Add documentation for TC_TYPE=HFSC.

--- ./conf/zone.dmz	2007-04-29 23:23:41.277403186 +0200
+++ ./conf/zone.dmz	2007-04-30 12:01:41.529492436 +0200
@@ -136,16 +136,22 @@
 ##	cls_fw
 ##	cls_u32
 ##	sch_sfq
-##	sch_cbq/sch_htb
+##	sch_htb/sch_hfsc
 ## Usage:
 ## TC_ENABLE=0|1
-## TC_TYPE=CBQ|HTB
-##
+## TC_TYPE=HTB|HFSC
+## TC_VOIP=0|1
 ## TC_UPLINK=<kbits>
 ## TC_DOWNLINK=<kbits>
-## The type specifies which shaper is to be used. The new HTB shaper is 
-##     better than the old CBQ, but not available on all systems. 
+## The type specifies which shaper is to be used. The HFSC shaper has more
+##   features than the HTP shaper, but may not be available on all systems.
+##   See http://luxik.cdi.cz/~devik/qos/htb/ for info about HTB, and
+##   http://www.cs.cmu.edu/~hzhang/HFSC/ for info about HFSC.
+## TC_VOIP is only implemented for HFSC type shaper. It reserves a minimum
+## bandwidth for voip traffic, and creates a special high priority class
+## for voip related traffic.
 ## The speeds should be below the actual speed of the link. 
 TC_ENABLE=0
+TC_TYPE=HTB
 TC_DOWNLINK=512
 TC_UPLINK=512
--- ./conf/zone.ext	2007-04-29 23:23:41.287401589 +0200
+++ ./conf/zone.ext	2007-04-30 12:01:37.494131884 +0200
@@ -128,16 +128,22 @@
 ##	cls_fw
 ##	cls_u32
 ##	sch_sfq
-##	sch_cbq or sch_htb
+##	sch_htb/sch_hfsc
 ## Usage:
 ## TC_ENABLE=0|1
-## TC_TYPE=CBQ|HTB
-##
+## TC_TYPE=HTB|HFSC
+## TC_VOIP=0|1
 ## TC_UPLINK=<kbits>
 ## TC_DOWNLINK=<kbits>
-## The type specifies which shaper is to be used. The new HTB shaper is 
-##     better than the old CBQ, but not available on all systems. 
+## The type specifies which shaper is to be used. The HFSC shaper has more
+##   features than the HTP shaper, but may not be available on all systems.
+##   See http://luxik.cdi.cz/~devik/qos/htb/ for info about HTB, and
+##   http://www.cs.cmu.edu/~hzhang/HFSC/ for info about HFSC.
+## TC_VOIP is only implemented for HFSC type shaper. It reserves a minimum
+## bandwidth for voip traffic, and creates a special high priority class
+## for voip related traffic.
 ## The speeds should be below the actual speed of the link. 
 TC_ENABLE=0
+TC_TYPE=HTB
 TC_DOWNLINK=512
 TC_UPLINK=512
--- ./conf/zone.int	2007-04-29 23:23:41.297399992 +0200
+++ ./conf/zone.int	2007-04-30 12:01:08.272762351 +0200
@@ -124,16 +124,22 @@
 ##	cls_fw
 ##	cls_u32
 ##	sch_sfq
-##	sch_cbq/sch_htb
+##	sch_htb/sch_hfsc
 ## Usage:
 ## TC_ENABLE=0|1
-## TC_TYPE=CBQ|HTB
-##
+## TC_TYPE=HTB|HFSC
+## TC_VOIP=0|1
 ## TC_UPLINK=<kbits>
 ## TC_DOWNLINK=<kbits>
-## The type specifies which shaper is to be used. The new HTB shaper is 
-##     better than the old CBQ, but not available on all systems. 
+## The type specifies which shaper is to be used. The HFSC shaper has more
+##   features than the HTP shaper, but may not be available on all systems.
+##   See http://luxik.cdi.cz/~devik/qos/htb/ for info about HTB, and
+##   http://www.cs.cmu.edu/~hzhang/HFSC/ for info about HFSC.
+## TC_VOIP is only implemented for HFSC type shaper. It reserves a minimum
+## bandwidth for voip traffic, and creates a special high priority class
+## for voip related traffic.
 ## The speeds should be below the actual speed of the link. 
 TC_ENABLE=0
+TC_TYPE=HTB
 TC_DOWNLINK=512
 TC_UPLINK=512
--- ./src/zone_rules.awk	2007-04-29 23:07:57.000000000 +0200
+++ ./src/zone_rules.awk	2007-04-30 11:56:08.650219278 +0200
@@ -72,7 +72,7 @@
     PATTERN["limit_rate"]        = "(second|minute|hour|day)"
     PATTERN["limit"]             = "#integer#/(#limit_rate#)"
     PATTERN["burst"]             = "#integer#"
-    PATTERN["tctype"]            = "(HTB|htb|HFSC|hfsc)"
+    PATTERN["tctype"]            = "(HTB|htb|HFSC|hfsc|CBQ|cbq)"
 
     # Rules:
     RULE["PROTO_IP"]             = "(proto_tcp_udp space port_list | proto_icmp space icmp_type | protocol) space src_ip to dst_ip"
--- ./src/iptables.sh	2005-11-24 23:57:40 +0300
+++ ./src/iptables.sh	2006-02-02 12:23:33 +0300
@@ -448,6 +448,16 @@
 	fi
     fi
 
+    # Warning for obsolete TC_TYPE values
+    if [ -n "${TC_TYPE}" ]; then
+        if (( TC_ENABLE == 1 )); then
+            if [[ "${TC_TYPE}" == "CBQ" ]]; then
+		print_err "Warning: obsolete value 'CBQ' of TC_TYPE directive found in zone ${ZONE}."
+		print_err "FIAIF now support only HTB and HFSC types of traffic shaping, and there are"
+		print_err "no CBQ support in this version of FIAIF. HTB will be used instead it."
+	    fi
+        fi
+    fi
     rm -f ${TMP_FILE}
     return ${AVAILABLE}
 }