Merge pull request #346 from FedeParola/nat-fixes

Fix NAT bugs
polycube-network · Oct 27, 2020 · d2f64b6 · d2f64b6
2 parents 7988930 + 0422d14
commit d2f64b6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/Documentation/services/pcn-nat/nat.rst b/Documentation/services/pcn-nat/nat.rst
@@ -172,7 +172,7 @@ To delete a single rule (an SNAT rule in the example):
 
 ::
 
-    polycubectl nat1 rule snat del RULE_ID
+    polycubectl nat1 rule snat entry del RULE_ID
 
 Deleting a rule does not affect ongoing natting sessions: to prevent a deleted rule from being applied, `flush the natting table <Natting-table>`_.
 

diff --git a/src/services/pcn-nat/src/IpAddr.h b/src/services/pcn-nat/src/IpAddr.h
@@ -43,7 +43,7 @@ struct IpAddr {
       throw std::runtime_error("Netmask can't be bigger than 32");
 
     ip_ = ipnetmask.substr(0, found);
-    ip = utils::ip_string_to_nbo_uint(ip_);
+    ip = utils::ip_string_to_nbo_uint(ip_) & ntohl(0xffffffff << (32 - netmask_));
     netmask = netmask_;
   }
   bool operator<(const IpAddr &that) const {

diff --git a/src/services/pcn-nat/src/Rule.cpp b/src/services/pcn-nat/src/Rule.cpp
@@ -27,12 +27,7 @@ Rule::Rule(Nat &parent, const RuleJsonObject &conf) : parent_(parent) {
   update(conf);
 }
 
-Rule::~Rule() {
-  delSnat();
-  delDnat();
-  delPortForwarding();
-  delMasquerade();
-}
+Rule::~Rule() {}
 
 void Rule::update(const RuleJsonObject &conf) {
   // This method updates all the object/parameter in Rule object specified in
@@ -87,7 +82,7 @@ void Rule::replaceSnat(const RuleSnatJsonObject &conf) {
 }
 
 void Rule::delSnat() {
-  snat_ = nullptr;
+  snat_->delEntryList();
 }
 
 std::shared_ptr<RuleMasquerade> Rule::getMasquerade() {
@@ -122,7 +117,7 @@ void Rule::replaceDnat(const RuleDnatJsonObject &conf) {
 }
 
 void Rule::delDnat() {
-  dnat_ = nullptr;
+  dnat_->delEntryList();
 }
 
 std::shared_ptr<RulePortForwarding> Rule::getPortForwarding() {
@@ -139,5 +134,5 @@ void Rule::replacePortForwarding(const RulePortForwardingJsonObject &conf) {
 }
 
 void Rule::delPortForwarding() {
-  portforwarding_ = nullptr;
+  portforwarding_->delEntryList();
 }
diff --git a/src/services/pcn-nat/src/RuleDnat.cpp b/src/services/pcn-nat/src/RuleDnat.cpp
@@ -30,7 +30,6 @@ RuleDnat::RuleDnat(Rule &parent, const RuleDnatJsonObject &conf)
 
 RuleDnat::~RuleDnat() {
   delEntryList();
-  logger()->info("Removed all DNAT rules");
 }
 
 void RuleDnat::update(const RuleDnatJsonObject &conf) {
@@ -151,4 +150,6 @@ void RuleDnat::delEntryList() {
   }
 
   rules_.clear();
+
+  logger()->info("Removed all DNAT rules");
 }
diff --git a/src/services/pcn-nat/src/RulePortForwarding.cpp b/src/services/pcn-nat/src/RulePortForwarding.cpp
@@ -31,7 +31,6 @@ RulePortForwarding::RulePortForwarding(Rule &parent,
 
 RulePortForwarding::~RulePortForwarding() {
   delEntryList();
-  logger()->info("Removed all PortForwarding rules");
 }
 
 void RulePortForwarding::update(const RulePortForwardingJsonObject &conf) {
@@ -157,4 +156,6 @@ void RulePortForwarding::delEntryList() {
   }
 
   rules_.clear();
+
+  logger()->info("Removed all PortForwarding rules");
 }
diff --git a/src/services/pcn-nat/src/RuleSnat.cpp b/src/services/pcn-nat/src/RuleSnat.cpp
@@ -28,7 +28,6 @@ RuleSnat::RuleSnat(Rule &parent, const RuleSnatJsonObject &conf)
 
 RuleSnat::~RuleSnat() {
   delEntryList();
-  logger()->info("Removed all SNAT rules");
 }
 
 void RuleSnat::update(const RuleSnatJsonObject &conf) {
@@ -145,4 +144,6 @@ void RuleSnat::delEntryList() {
   }
 
   rules_.clear();
+
+  logger()->info("Removed all SNAT rules");
 }