diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-20 14:22:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-20 14:22:39 -0700 |
| commit | 343fefc7d7511a260c639d4e763713a2b1b4657e (patch) | |
| tree | 8da71f08e6472609149d455f24d9d1168b2ec437 /ipacm/src/IPACM_Conntrack_NATApp.cpp | |
| parent | 0f02b6d46168f8bca5a86c655e332cf7b724e701 (diff) | |
| parent | 421f006fc1c495853d25f5002afa57732efc5166 (diff) | |
| download | ipacfg-mgr-343fefc7d7511a260c639d4e763713a2b1b4657e.tar.gz | |
Merge "ipa : Addition of diag log messages for IPA NAT"
Diffstat (limited to 'ipacm/src/IPACM_Conntrack_NATApp.cpp')
| -rw-r--r-- | ipacm/src/IPACM_Conntrack_NATApp.cpp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/ipacm/src/IPACM_Conntrack_NATApp.cpp b/ipacm/src/IPACM_Conntrack_NATApp.cpp index bf0daac..ff02c2a 100644 --- a/ipacm/src/IPACM_Conntrack_NATApp.cpp +++ b/ipacm/src/IPACM_Conntrack_NATApp.cpp @@ -131,7 +131,7 @@ int NatApp::AddTable(uint32_t pub_ip) int ret; int cnt = 0; ipa_nat_ipv4_rule nat_rule; - IPACMDBG("%s() %d\n", __FUNCTION__, __LINE__); + IPACMDBG_H("%s() %d\n", __FUNCTION__, __LINE__); /* Not reset the cache wait it timeout by destroy event */ #if 0 @@ -204,7 +204,7 @@ void NatApp::Reset() int NatApp::DeleteTable(uint32_t pub_ip) { int ret; - IPACMDBG("%s() %d\n", __FUNCTION__, __LINE__); + IPACMDBG_H("%s() %d\n", __FUNCTION__, __LINE__); CHK_TBL_HDL(); @@ -232,7 +232,6 @@ bool NatApp::ChkForDup(const nat_table_entry *rule) { int cnt = 0; IPACMDBG("%s() %d\n", __FUNCTION__, __LINE__); - for(; cnt < max_entries; cnt++) { if(cache[cnt].private_ip == rule->private_ip && @@ -241,11 +240,8 @@ bool NatApp::ChkForDup(const nat_table_entry *rule) cache[cnt].target_port == rule->target_port && cache[cnt].protocol == rule->protocol) { - IPACMDBG("Duplicate Rule\n"); - iptodot("Private IP", rule->private_ip); - iptodot("Target IP", rule->target_ip); - IPACMDBG("Private Port: %d\t Target Port: %d\t", rule->private_port, rule->target_port); - IPACMDBG("protocolcol: %d\n", rule->protocol); + log_nat(rule->protocol,rule->private_ip,rule->target_ip,rule->private_port,\ + rule->target_port,"Duplicate Rule"); return true; } } @@ -259,11 +255,9 @@ int NatApp::DeleteEntry(const nat_table_entry *rule) int cnt = 0; IPACMDBG("%s() %d\n", __FUNCTION__, __LINE__); - IPACMDBG("Received below nat entry for deletion\n"); - iptodot("Private IP", rule->private_ip); - iptodot("Target IP", rule->target_ip); - IPACMDBG("Private Port: %d\t Target Port: %d\t", rule->private_port, rule->target_port); - IPACMDBG("protocolcol: %d\n", rule->protocol); + log_nat(rule->protocol,rule->private_ip,rule->target_ip,rule->private_port,\ + rule->target_port,"for deletion"); + for(; cnt < max_entries; cnt++) { @@ -306,13 +300,8 @@ int NatApp::AddEntry(const nat_table_entry *rule) IPACMDBG("%s() %d\n", __FUNCTION__, __LINE__); CHK_TBL_HDL(); - - IPACMDBG("Received below nat entry for addition\n"); - iptodot("Private IP", rule->private_ip); - iptodot("Target IP", rule->target_ip); - IPACMDBG("Private Port: %d\t Target Port: %d\t", rule->private_port, rule->target_port); - IPACMDBG("protocolcol: %d\n", rule->protocol); - + log_nat(rule->protocol,rule->private_ip,rule->target_ip,rule->private_port,\ + rule->target_port,"for addition"); if(isAlgPort(rule->protocol, rule->private_port) || isAlgPort(rule->protocol, rule->target_port)) { |