pcn-firewall: small code cleanup

Signed-off-by: Matteo Bertrone <m.bertrone@gmail.com>

Author: mbertrone

src/services/pcn-firewall/src/Chain.cpp

@@ -179,7 +179,7 @@ ChainResetCountersOutputJsonObject Chain::resetCounters() {
     }
 
     dynamic_cast<Firewall::DefaultAction *>(
-            programs->at(ModulesConstants::DEFAULTACTION))->flushCounters(name);
+            programs->at(ModulesConstants::DEFAULTACTION))->flushCounters();
 
     counters_.clear();
 
@@ -285,8 +285,8 @@ void Chain::updateChain() {
         // SWAP indexes
         *horus_swap_ = !(*horus_swap_);
 
-        uint8_t horus_index_new = -1;
-        uint8_t horus_index_old = -1;
+        uint8_t horus_index_new;
+        uint8_t horus_index_old;
 
         // Apply Horus optimization
 
@@ -523,7 +523,6 @@ void Chain::updateChain() {
   if (index == startingIndex) {
     firstProgramLoaded = actionlookup;
   }
-  ++index;
 
   for (auto &rule : rules_) {
     actionlookup->updateTableValue(rule->getId(),
@@ -643,8 +642,7 @@ std::vector<std::shared_ptr<ChainRule>> Chain::getRuleList() {
   defaultRule.setDescription("Default Policy");
   defaultRule.setId(rules_.size());
 
-  rules.push_back(
-      std::shared_ptr<ChainRule>(new ChainRule(*this, defaultRule)));
+  rules.push_back(std::make_shared<ChainRule>(*this, defaultRule));
 
   return rules;
 }
@@ -663,7 +661,7 @@ void Chain::addRule(const uint32_t &id, const ChainRuleJsonObject &conf) {
   if (newRule == nullptr) {
     // Totally useless, but it is needed to avoid the compiler making wrong
     // assumptions and reordering
-    throw new std::runtime_error("I won't be thrown");
+    throw std::runtime_error("I won't be thrown");
 
   } else if (rules_.size() <= id && newRule != nullptr) {
     rules_.resize(rules_.size() + 1);
@@ -775,7 +773,7 @@ ChainInsertOutputJsonObject Chain::insert(ChainInsertInputJsonObject input) {
   if (newRule == nullptr) {
     // Totally useless, but it is needed to avoid the compiler making wrong
     // assumptions and reordering
-    throw new std::runtime_error("I won't be thrown");
+    throw std::runtime_error("I won't be thrown");
 
   } else if (rules_.size() >= id && newRule != nullptr) {
     rules_.resize(rules_.size() + 1);

src/services/pcn-firewall/src/Chain.h

@@ -97,9 +97,6 @@ class Chain : public ChainBase {
 
   void updateChain();
 
-  /*Like getRuleList, but without the last (fake) default rule*/
-  std::vector<std::shared_ptr<ChainRule>> getRealRuleList();
-
   static bool ipFromRulesToMap(
           const uint8_t &type, std::map<struct IpAddr, std::vector<uint64_t>> &ips,
           const std::vector<std::shared_ptr<ChainRule>> &rules);

src/services/pcn-firewall/src/ChainStats.cpp

@@ -166,8 +166,8 @@ std::shared_ptr<ChainStats> ChainStats::getDefaultActionCounters(
   auto actionProgram = dynamic_cast<Firewall::DefaultAction *>(
       programs->at(ModulesConstants::DEFAULTACTION));
 
-  csj.setPkts(actionProgram->getPktsCount(parent.name));
-  csj.setBytes(actionProgram->getBytesCount(parent.name));
+  csj.setPkts(actionProgram->getPktsCount());
+  csj.setBytes(actionProgram->getBytesCount());
 
   return std::make_shared<ChainStats>(parent, csj);
 }

src/services/pcn-firewall/src/Firewall.h

@@ -177,14 +177,13 @@ class Firewall : public FirewallBase {
 
   class Horus : public Program {
   public:
-      enum HorusType { HORUS_INGRESS, HORUS_EGRESS };
 
       Horus(const int &index, Firewall &outer, const ChainNameEnum &direction,
               const std::map<struct HorusRule, struct HorusValue> &horus);
       ~Horus();
 
       std::string getCode();
-      std::string defaultActionString(ChainNameEnum chain);  // Overrides
+      std::string defaultActionString();
 
       uint64_t getPktsCount(int rule_number);
       uint64_t getBytesCount(int rule_number);
@@ -195,7 +194,6 @@ class Firewall : public FirewallBase {
       void updateMap(const std::map<struct HorusRule, struct HorusValue> &horus);
 
   private:
-      HorusType type_;
       std::map<struct HorusRule, struct HorusValue> horus_;
   };
 
@@ -305,9 +303,9 @@ class Firewall : public FirewallBase {
     DefaultAction(const int &index, const ChainNameEnum &direction,
                   Firewall &outer);
     ~DefaultAction();
-    uint64_t getPktsCount(ChainNameEnum chain);
-    uint64_t getBytesCount(ChainNameEnum chain);
-    void flushCounters(ChainNameEnum chain);
+    uint64_t getPktsCount();
+    uint64_t getBytesCount();
+    void flushCounters();
     std::string getCode();
   };
 

src/services/pcn-firewall/src/Utils.cpp

@@ -551,7 +551,6 @@ void Chain::horusFromRulesToMap(
   struct HorusRule key;
   struct HorusValue value;
 
-//  bool first_rule = true;
   uint64_t set_fields = 0;
 
   // find match pattern for first rule (e.g. 01101 means ips proto ports set)
@@ -587,7 +586,7 @@ bool Chain::conntrackFromRulesToMap(
 
   for (auto const &rule : rules) {
     try {
-      rule_state = ChainRuleConntrackEnum_to_int(rule->getConntrack());
+      ChainRuleConntrackEnum_to_int(rule->getConntrack());
       conntrackRulePresent = true;
     } catch (...) {
     }

src/services/pcn-firewall/src/modules/DefaultAction.cpp

@@ -46,7 +46,7 @@ std::string Firewall::DefaultAction::getCode() {
   return noMacroCode;
 }
 
-uint64_t Firewall::DefaultAction::getPktsCount(ChainNameEnum chain) {
+uint64_t Firewall::DefaultAction::getPktsCount() {
   std::string tableName = "pktsCounter";
 
   try {
@@ -61,7 +61,7 @@ uint64_t Firewall::DefaultAction::getPktsCount(ChainNameEnum chain) {
   }
 }
 
-uint64_t Firewall::DefaultAction::getBytesCount(ChainNameEnum chain) {
+uint64_t Firewall::DefaultAction::getBytesCount() {
   std::string tableName = "bytesCounter";
 
   try {
@@ -77,7 +77,7 @@ uint64_t Firewall::DefaultAction::getBytesCount(ChainNameEnum chain) {
   }
 }
 
-void Firewall::DefaultAction::flushCounters(ChainNameEnum chain) {
+void Firewall::DefaultAction::flushCounters() {
   std::string pktsTableName = "pktsCounter";
   std::string bytesTableName = "bytesCounter";
 

src/services/pcn-firewall/src/modules/Horus.cpp

@@ -69,7 +69,7 @@ Firewall::Horus::Horus(
 
 Firewall::Horus::~Horus() {}
 
-std::string Firewall::Horus::defaultActionString(ChainNameEnum chain) {
+std::string Firewall::Horus::defaultActionString() {
   return "";
 }