Merge "IPACM: Fix NAT table didn't delete when LTE down"
diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h
index 21255f3..6e509f9 100644
--- a/ipacm/inc/IPACM_Defs.h
+++ b/ipacm/inc/IPACM_Defs.h
@@ -120,7 +120,7 @@
IPA_SW_ROUTING_DISABLE, /* 19 NULL */
IPA_PROCESS_CT_MESSAGE, /* 20 ipacm_ct_evt_data */
IPA_HANDLE_WAN_UP, /* 21 ipacm_event_iface_up */
- IPA_HANDLE_WAN_DOWN, /* 22 unsigned long */
+ IPA_HANDLE_WAN_DOWN, /* 22 ipacm_event_iface_up */
IPA_HANDLE_WLAN_UP, /* 23 ipacm_event_iface_up */
IPA_HANDLE_LAN_UP, /* 24 ipacm_event_iface_up */
IPA_WLAN_CLIENT_ADD_EVENT_EX, /* 25 ipacm_event_data_wlan_ex */
diff --git a/ipacm/src/IPACM_ConntrackListener.cpp b/ipacm/src/IPACM_ConntrackListener.cpp
index 9000827..25fd9f8 100644
--- a/ipacm/src/IPACM_ConntrackListener.cpp
+++ b/ipacm/src/IPACM_ConntrackListener.cpp
@@ -60,7 +60,7 @@
void IPACM_ConntrackListener::event_callback(ipa_cm_event_id evt,
void *data)
{
- uint32_t *pub_addr = NULL;
+ ipacm_event_iface_up *wan_down = NULL;
if(data == NULL)
{
@@ -85,10 +85,10 @@
case IPA_HANDLE_WAN_DOWN:
IPACMDBG("Received IPA_HANDLE_WAN_DOWN event\n");
- pub_addr = (uint32_t *)data;
+ wan_down = (ipacm_event_iface_up *)data;
if(isWanUp == true)
{
- TriggerWANDown(*pub_addr);
+ TriggerWANDown(wan_down->ipv4_addr);
}
break;
diff --git a/ipacm/src/IPACM_Conntrack_NATApp.cpp b/ipacm/src/IPACM_Conntrack_NATApp.cpp
index 36dec9a..99c3b61 100644
--- a/ipacm/src/IPACM_Conntrack_NATApp.cpp
+++ b/ipacm/src/IPACM_Conntrack_NATApp.cpp
@@ -255,7 +255,7 @@
CHK_TBL_HDL();
- IPACMDBG("Received below nat entry for deletion\n");
+ IPACMDBG("Received below nat entry for addition\n");
IPACM_ConntrackClient::iptodot("Private IP", rule->private_ip);
IPACM_ConntrackClient::iptodot("Target IP", rule->target_ip);
IPACMDBG("Private Port: %d\t Target Port: %d\t", rule->private_port, rule->target_port);
diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index 1f04701..964ad9e 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -2824,7 +2824,7 @@
evt_data.event = IPA_HANDLE_WAN_DOWN;
evt_data.evt_data = (void *)wandown_data;
/* Insert IPA_HANDLE_WAN_DOWN to command queue */
- IPACMDBG("posting IPA_HANDLE_WAN_DOWN for IPv4 \n");
+ IPACMDBG("posting IPA_HANDLE_WAN_DOWN for IPv4 with address: 0x%x\n", wan_v4_addr);
IPACM_EvtDispatcher::PostEvt(&evt_data);
IPACMDBG("setup wan_up/active_v4= false \n");