Changeset 9679928e3424ddb216ce7cb6ae23351b51728b78

Timestamp:

05/30/09 06:29:48 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

96808c5450804cf9cc6a590500ccce6131c2b937

Parents:

a0fbd8081aad14716555b28cab27c19b76973eea

git-committer:

Neutron Soutmun <neo.neutron@…> (05/30/09 06:29:48)

Message:

Adjust firewall script, handle bittorrent throttle

• The firewall script now handle bittorrent throttle properly.
• Adjust the priority of the throttle filter which more important over the users' session filter.

Location:

tools

Files:

• bandwidth.sh.in (modified) (5 diffs)
• firewall.sh.in (modified) (2 diffs)

tools/bandwidth.sh.in

@@ -79 +79 @@
       $TC qdisc add dev $SHAPING_DOWN_INF parent 1:${BITTORRENT_ID} \
         handle ${BITTORRENT_ID}: sfq perturb 10
-      $TC filter add dev $SHAPING_DOWN_INF parent 1: protocol ip prio 5 \
+      $TC filter add dev $SHAPING_DOWN_INF parent 1: protocol ip prio 1 \
         handle 0x3 fw classid 1:${BITTORRENT_ID}
 
@@ -87 +87 @@
       $TC qdisc add dev $SHAPING_UP_INF parent 2:${BITTORRENT_ID} \
         handle ${BITTORRENT_ID}: sfq perturb 10
-      $TC filter add dev $SHAPING_UP_INF parent 2: protocol ip prio 5 \
+      $TC filter add dev $SHAPING_UP_INF parent 2: protocol ip prio 1 \
         handle 0x3 fw classid 2:${BITTORRENT_ID}
       ;;
@@ -143 +143 @@
     classid 1:${ID} htb rate ${DOWNSPEED}bit ceil ${DOWNSPEED}bit
   $TC filter add dev $SHAPING_DOWN_INF parent 1: \
-    protocol ip prio 1 u32 match ip dst ${IP}/32 flowid 1:${ID}
+    protocol ip prio 2 u32 match ip dst ${IP}/32 flowid 1:${ID}
 
   # Uplink
@@ -149 +149 @@
     classid 2:${ID} htb rate ${UPSPEED}bit ceil ${UPSPEED}bit
   $TC filter add dev $SHAPING_UP_INF parent 2: \
-    protocol ip prio 1 u32 match ip src ${IP}/32 flowid 2:${ID}
+    protocol ip prio 2 u32 match ip src ${IP}/32 flowid 2:${ID}
 }
 
@@ -161 +161 @@
   UP_HANDLE=`$TC filter show dev $SHAPING_UP_INF | grep -w "flowid 2:${ID} " | awk '{print $10}'`
   $TC filter del dev $SHAPING_DOWN_INF parent 1: \
-    prio 1 handle ${DOWN_HANDLE} u32
+    prio 2 handle ${DOWN_HANDLE} u32
   $TC filter del dev $SHAPING_UP_INF parent 2: \
-    prio 1 handle ${UP_HANDLE} u32
+    prio 2 handle ${UP_HANDLE} u32
 
   # Class Removal

tools/firewall.sh.in

@@ -485 +485 @@
   #   bittorrent-announce is customized pattern, warning if not exists.
   ##
-  if [ "$BITTORRENT" = "yes" -o -n "$BITTORRENT_ALLOW" ]; then
+  if [ "$BITTORRENT" = "yes" ] || [ -n "$BITTORRENT_ALLOW" ]; then
     if [ -n "$BITTORRENT_ALLOW" ]; then
       BITTORRENT_ALLOW_OPTIONS="-m set ! --set $P2P_ALLOW_SET"
@@ -493 +493 @@
       $IPTABLES -t mangle -A $CHAIN_MANGLE_PREROUTING -m layer7 --l7proto bittorrent $BITTORRENT_ALLOW_OPTIONS src -j DROP
     fi
-  else
+  elif [ "$BITTORRENT" = "block" ]; then
       $IPTABLES -t mangle -A $CHAIN_MANGLE_PREROUTING -m layer7 --l7proto bittorrent-announce -j DROP
       $IPTABLES -t mangle -A $CHAIN_MANGLE_PREROUTING -m layer7 --l7proto bittorrent -j DROP