Merge "IPACM: fix the MHI icmpv6 exception rule"
diff --git a/ipacm/src/IPACM_Conntrack_NATApp.cpp b/ipacm/src/IPACM_Conntrack_NATApp.cpp
index c1f47e1..0cf101f 100644
--- a/ipacm/src/IPACM_Conntrack_NATApp.cpp
+++ b/ipacm/src/IPACM_Conntrack_NATApp.cpp
@@ -195,6 +195,12 @@
}
}
+ /* configure NAT initialization paramater */
+ pub_ip_addr = pub_ip;
+ pub_mux_id = mux_id;
+ IPACMDBG(" Set pub_mux_id: %d\t", pub_mux_id);
+
+
/* Add back the cached NAT-entry */
if (pub_ip == pub_ip_addr_pre)
{
@@ -222,6 +228,8 @@
/* send connections info to pcie modem only with DL direction */
if ((CtList->backhaul_mode == Q6_MHI_WAN) && (cache[cnt].dst_nat == true || cache[cnt].protocol == IPPROTO_TCP))
{
+ /* propagate pub_ip info */
+ cache[cnt].public_ip = pub_ip;
ret = AddConnection(&cache[cnt]);
if(ret > 0)
{
@@ -246,9 +254,6 @@
}
}
- pub_ip_addr = pub_ip;
- pub_mux_id = mux_id;
- IPACMDBG(" Set pub_mux_id: %d\t", pub_mux_id);
return 0;
}