From ddc50606d72113472e8a9222d690f79333a72341 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Tue, 14 Aug 2012 16:34:39 +0530
Subject: [PATCH] bug CS-15982: corrected order of sent and rcvd usage rules
 status CS-15982: resolved fixed

---
 .../systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
index 4d423fc2334..71deec0ea07 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
@@ -34,8 +34,8 @@ create_usage_rules () {
   then 
     iptables -N NETWORK_STATS_$ethDev > /dev/null;
     iptables -I FORWARD -j NETWORK_STATS_$ethDev > /dev/null;
-    iptables -A NETWORK_STATS_$ethDev -i $ethDev -d $vcidr > /dev/null;
     iptables -A NETWORK_STATS_$ethDev -o $ethDev -s $vcidr > /dev/null;
+    iptables -A NETWORK_STATS_$ethDev -i $ethDev -d $vcidr > /dev/null;
   fi  
   return $?
 }
@@ -46,8 +46,8 @@ create_vpn_usage_rules () {
   then 
     iptables -t mangle -N VPN_STATS_$ethDev > /dev/null;
     iptables -t mangle -I FORWARD -j VPN_STATS_$ethDev > /dev/null;
-    iptables -t mangle -A VPN_STATS_$ethDev -i $ethDev -m mark --mark $vpninmark > /dev/null;
     iptables -t mangle -A VPN_STATS_$ethDev -o $ethDev -m mark --mark $vpnoutmark > /dev/null;
+    iptables -t mangle -A VPN_STATS_$ethDev -i $ethDev -m mark --mark $vpninmark > /dev/null;
   fi
   return $?
 }
@@ -69,8 +69,10 @@ get_usage () {
       then
         # flush rules and remove chain
         iptables -F NETWORK_STATS_$i > /dev/null;
+        iptables -D FORWARD -j NETWORK_STATS_$i > /dev/null;
         iptables -X NETWORK_STATS_$i > /dev/null;
         iptables -t mangle -F VPN_STATS_$i > /dev/null;
+        iptables -t mangle -D FORWARD -j VPN_STATS_$i > /dev/null;
         iptables -t mangle -X VPN_STATS_$i > /dev/null;                            
       fi
     done