Merge 8ea0f0b386c9590fc89615e5c56e9136bc4fead2 on remote branch
Change-Id: Iac842893b391b0c51bcdd33da4dfe20bbc235f1e
diff --git a/ipacm/src/IPACM_ConntrackListener.cpp b/ipacm/src/IPACM_ConntrackListener.cpp
index 29a70b9..d6289e3 100644
--- a/ipacm/src/IPACM_ConntrackListener.cpp
+++ b/ipacm/src/IPACM_ConntrackListener.cpp
@@ -345,10 +345,13 @@
void IPACM_ConntrackListener::TriggerWANUp(void *in_param)
{
ipacm_event_iface_up *wanup_data = (ipacm_event_iface_up *)in_param;
+ uint8_t mux_id;
IPACMDBG_H("Recevied below information during wanup,\n");
- IPACMDBG_H("if_name:%s, ipv4_address:0x%x\n",
- wanup_data->ifname, wanup_data->ipv4_addr);
+ IPACMDBG_H("if_name:%s, ipv4_address:0x%x mux_id:%d, xlat_mux_id:%d\n",
+ wanup_data->ifname, wanup_data->ipv4_addr,
+ wanup_data->mux_id,
+ wanup_data->xlat_mux_id);
if(wanup_data->ipv4_addr == 0)
{
@@ -373,7 +376,11 @@
if(nat_inst != NULL)
{
- nat_inst->AddTable(wanup_data->ipv4_addr, wanup_data->mux_id);
+ if (wanup_data->mux_id == 0)
+ mux_id = wanup_data->xlat_mux_id;
+ else
+ mux_id = wanup_data->mux_id;
+ nat_inst->AddTable(wanup_data->ipv4_addr, mux_id);
}
IPACMDBG("creating nat threads\n");
diff --git a/ipacm/src/IPACM_Main.cpp b/ipacm/src/IPACM_Main.cpp
index a3ac562..cd2aae9 100644
--- a/ipacm/src/IPACM_Main.cpp
+++ b/ipacm/src/IPACM_Main.cpp
@@ -611,6 +611,7 @@
case WLAN_SWITCH_TO_SCC:
IPACMDBG_H("Received WLAN_SWITCH_TO_SCC\n");
+ [[fallthrough]];
case WLAN_WDI_ENABLE:
IPACMDBG_H("Received WLAN_WDI_ENABLE\n");
if (IPACM_Iface::ipacmcfg->isMCC_Mode == true)
@@ -622,6 +623,7 @@
continue;
case WLAN_SWITCH_TO_MCC:
IPACMDBG_H("Received WLAN_SWITCH_TO_MCC\n");
+ [[fallthrough]];
case WLAN_WDI_DISABLE:
IPACMDBG_H("Received WLAN_WDI_DISABLE\n");
if (IPACM_Iface::ipacmcfg->isMCC_Mode == false)