Merge pull request #129 from polycube-network/pr/iptables_minor_fixes

pcn-iptables: minor fixes
polycube-network · May 21, 2019 · f516714 · f516714
2 parents 8ad1b6c + d7285b1
commit f516714
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/services/pcn-iptables/src/Chain.cpp b/src/services/pcn-iptables/src/Chain.cpp
@@ -232,6 +232,10 @@ ChainInsertOutputJsonObject Chain::insert(ChainInsertInputJsonObject input) {
     id = input.getId();
   }
 
+  if (id > rules_.size()) {
+    throw std::runtime_error("id not allowed");
+  }
+
   auto newRule = std::make_shared<ChainRule>(*this, conf);
 
   ChainStatsJsonObject confStats;
@@ -1072,4 +1076,4 @@ void Chain::delRuleList() {
   if (parent_.interactive_) {
     applyRules();
   }
-}
+}
diff --git a/src/services/pcn-iptables/src/ChainRule.cpp b/src/services/pcn-iptables/src/ChainRule.cpp
@@ -176,6 +176,20 @@ bool ChainRule::equal(ChainRule &cmp) {
       return false;
   }
 
+  if (inIfaceIsSet != cmp.inIfaceIsSet)
+    return false;
+  if (inIfaceIsSet) {
+    if (inIface != cmp.inIface)
+      return false;
+  }
+
+  if (outIfaceIsSet != cmp.outIfaceIsSet)
+    return false;
+  if (outIfaceIsSet) {
+    if (outIface != cmp.outIface)
+      return false;
+  }
+
   if (actionIsSet != cmp.actionIsSet)
     return false;