Merge branch 'prevent-datasid-proinfodata-conflict' of /home/git/repositories/proinfodata/unstable

collect/net/bandwidth.sh

@@ -112,12 +112,12 @@ if test $? -ne 0; then exit 2; fi
 check_traffic_date
 if test $? -ne 0; then exit 3; fi
 
-INPUT_COUNT=$(sudo $IPTABLES -nvxL INPUT | grep INPUT_COUNTS | \
+INPUT_COUNT=$(sudo $IPTABLES -nvxL INPUT | grep PID_INPUT_COUNTS | \
               awk 'BEGIN{pkts=0; bytes=0} \
                    {pkts+=$1; bytes+=$2} \
                    END{print pkts,bytes}')
 
-OUTPUT_COUNT=$(sudo $IPTABLES -nvxL OUTPUT | grep OUTPUT_COUNTS | \
+OUTPUT_COUNT=$(sudo $IPTABLES -nvxL OUTPUT | grep PID_OUTPUT_COUNTS | \
                awk 'BEGIN{pkts=0; bytes=0} \
                     {pkts+=$1; bytes+=$2} \
                     END{print pkts,bytes}')
@@ -132,9 +132,9 @@ echo "$INTERVALID $INPUT_COUNT $OUTPUT_COUNT" >> $TRAFFIC
 if test -f "$INTERFACES"; then
     while IFS=$' ' read -a net; do
         sudo $IPTABLES -D INPUT -i ${net[0]} ! -s ${net[1]} -m comment \
-             --comment INPUT_COUNTS 2>/dev/null
+             --comment PID_INPUT_COUNTS 2>/dev/null
         sudo $IPTABLES -D OUTPUT -o ${net[0]} ! -d ${net[1]} -m comment \
-             --comment OUTPUT_COUNTS 2>/dev/null
+             --comment PID_OUTPUT_COUNTS 2>/dev/null
     done < $INTERFACES
 fi
 
@@ -153,7 +153,7 @@ done
 # Insert new rules
 while IFS=$' ' read -a net; do
     sudo $IPTABLES -I INPUT -i ${net[0]} ! -s ${net[1]} -m comment \
-         --comment INPUT_COUNTS
+         --comment PID_INPUT_COUNTS
     sudo $IPTABLES -I OUTPUT -o ${net[0]} ! -d ${net[1]} -m comment \
-         --comment OUTPUT_COUNTS
+         --comment PID_OUTPUT_COUNTS
 done < $INTERFACES