ipacm: post IPA_HANDLE_WAN_UP_TETHER event when routing is set
There is a race condition between setupstream and IPA_NEW_NEIGH_EVENT.
If we receive IPA_NEW_NEIGH_EVENT after setupstream, IPA_HANDLE_WAN_UP_TETHER
event is not posted. Post IPA_HANDLE_WAN_UP_TETHER event inside
handle_route_add_evt method to avoid the race condition.
Change-Id: I5d884075e463749325d6ee2d6541c4aea4859183
diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index be2c0a2..784fb0e 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -767,9 +767,9 @@
}
}
#ifdef FEATURE_IPA_ANDROID
-#ifdef FEATURE_IPACM_HAL
- post_wan_up_tether_evt(data->iptype, 0);
-#else
+#ifndef FEATURE_IPACM_HAL
+ /* Fixed CR 2438491 for HAL-android platform trgets.
+ Need to revisit for non-hal-android-platform targets if issue could be reproduced there as well */
/* using ipa_if_index, not netdev_index */
post_wan_up_tether_evt(data->iptype, iface_ipa_index_query(data->if_index_tether));
#endif
@@ -802,15 +802,14 @@
handle_route_add_evt(data->iptype);
}
}
-#ifdef FEATURE_IPA_ANDROID
-#ifdef FEATURE_IPACM_HAL
- post_wan_up_tether_evt(data->iptype, 0);
-#else
- /* using ipa_if_index, not netdev_index */
- post_wan_up_tether_evt(data->iptype, iface_ipa_index_query(data->if_index_tether));
-#endif
-#endif
}
+#ifdef FEATURE_IPA_ANDROID
+#ifndef FEATURE_IPACM_HAL
+ /* using ipa_if_index, not netdev_index */
+ post_wan_up_tether_evt(data->iptype, iface_ipa_index_query(data->if_index_tether));
+#endif
+#endif
+
}
else /* double check if current default iface is not itself */
{
@@ -1638,6 +1637,10 @@
evt_data.event = IPA_HANDLE_WAN_UP;
evt_data.evt_data = (void *)wanup_data;
IPACM_EvtDispatcher::PostEvt(&evt_data);
+
+#ifdef FEATURE_IPACM_HAL
+ post_wan_up_tether_evt(IPA_IP_v4, 0);
+#endif
}
else
{
@@ -1677,6 +1680,10 @@
evt_data.event = IPA_HANDLE_WAN_UP_V6;
evt_data.evt_data = (void *)wanup_data;
IPACM_EvtDispatcher::PostEvt(&evt_data);
+
+#ifdef FEATURE_IPACM_HAL
+ post_wan_up_tether_evt(IPA_IP_v6, 0);
+#endif
}
if(IPACM_Iface::ipacmcfg->GetIPAVer() >= IPA_HW_None && IPACM_Iface::ipacmcfg->GetIPAVer() < IPA_HW_v4_0)
{