From 4901400bc4e83a779bd7203a4772747a18a3f38b Mon Sep 17 00:00:00 2001
From: Emerson Pinter <dev@pinter.com.br>
Date: Thu, 18 Oct 2012 01:39:56 -0300
Subject: [PATCH] Revert "BandwidthController: hookup qtaguid for tracking
 closest to devices."

This reverts commit f66d6e9db6be3e94b80c59fab99e237d2e2968c5.

Conflicts:

	BandwidthController.cpp

Change-Id: Ibc3946aa390ff58b5070658cf181aeb7c5ff6b67
---
 BandwidthController.cpp |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/BandwidthController.cpp b/BandwidthController.cpp
index 3b0c2ac..e1ef546 100644
--- a/BandwidthController.cpp
+++ b/BandwidthController.cpp
@@ -106,9 +106,6 @@ const char *BandwidthController::IPT_FLUSH_COMMANDS[] = {
     "-F bw_FORWARD",
     "-F penalty_box",
     "-F costly_shared",
-
-    "-t raw -F bw_raw_PREROUTING",
-    "-t mangle -F bw_mangle_POSTROUTING",
 };

 /* The cleanup commands assume flushing has been done. */
@@ -117,18 +114,11 @@ const char *BandwidthController::IPT_CLEANUP_COMMANDS[] = {
     "-D INPUT -j bw_INPUT",
     "-D OUTPUT -j bw_OUTPUT",
     "-D FORWARD -j bw_FORWARD",
-
-    "-t raw -D bw_raw_PREROUTING",
-    "-t mangle -D bw_mangle_POSTROUTING",
-
     "-X bw_INPUT",
     "-X bw_OUTPUT",
     "-X bw_FORWARD",
     "-X penalty_box",
     "-X costly_shared",
-
-    "-t raw -X bw_raw_PREROUTING",
-    "-t mangle -X bw_mangle_POSTROUTING",
 };

 const char *BandwidthController::IPT_SETUP_COMMANDS[] = {
@@ -144,11 +134,6 @@ const char *BandwidthController::IPT_SETUP_COMMANDS[] = {

     "-N costly_shared",
     "-N penalty_box",
-
-    "-t raw -N bw_raw_PREROUTING",
-    "-t raw -A PREROUTING -j bw_raw_PREROUTING",
-    "-t mangle -N bw_mangle_POSTROUTING",
-    "-t mangle -A POSTROUTING -j bw_mangle_POSTROUTING",
 };

 const char *BandwidthController::IPT_BASIC_ACCOUNTING_COMMANDS[] = {
@@ -159,9 +144,7 @@ const char *BandwidthController::IPT_BASIC_ACCOUNTING_COMMANDS[] = {
     "-A bw_OUTPUT -m owner --socket-exists", /* This is a tracking rule. */

     "-A costly_shared --jump penalty_box",
-
-    "-t raw -A bw_raw_PREROUTING ! -i lo+ -m owner --socket-exists", /* This is a tracking rule. */
-    "-t mangle -A bw_mangle_POSTROUTING ! -o lo+ -m owner --socket-exists", /* This is a tracking rule. */
+    "-A costly_shared -m owner --socket-exists", /* This is a tracking rule. */
 };

 BandwidthController::BandwidthController(void) {
--
1.7.9.1