summaryrefslogtreecommitdiff
path: root/ipacm/src/IPACM_IfaceManager.cpp
diff options
context:
space:
mode:
authorSkylar Chang <chiaweic@codeaurora.org>2014-08-13 11:44:35 -0700
committerSkylar Chang <chiaweic@codeaurora.org>2014-08-13 12:02:17 -0700
commitd1e8dd8c4b6b10538b672d53bd298d3ba1335dff (patch)
tree6db8ed622dcdc4437e1e81af597e4fff111dab32 /ipacm/src/IPACM_IfaceManager.cpp
parent6a1e1fc21072e87244c2a207e18d6d4e33252f9f (diff)
downloadipacfg-mgr-d1e8dd8c4b6b10538b672d53bd298d3ba1335dff.tar.gz
IPACM: get upstream and tethered iface in Android
In android platform, IPACM needs to get upstream wan iface and tetherd iface from CnE and construct the right filter/routing rules on the RX endpoint of tethered ifaces. Change-Id: Ie81aee57298dc6f2e6a677a394ac5eadb1ff8f27
Diffstat (limited to 'ipacm/src/IPACM_IfaceManager.cpp')
-rw-r--r--ipacm/src/IPACM_IfaceManager.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/ipacm/src/IPACM_IfaceManager.cpp b/ipacm/src/IPACM_IfaceManager.cpp
index bbce080..af9811c 100644
--- a/ipacm/src/IPACM_IfaceManager.cpp
+++ b/ipacm/src/IPACM_IfaceManager.cpp
@@ -229,15 +229,12 @@ int IPACM_IfaceManager::create_iface_instance(int if_index, ipacm_wan_iface_type
IPACMDBG_H("Creating Wan interface\n");
IPACM_Wan *w = new IPACM_Wan(ipa_interface_index, is_sta_mode);
IPACM_EvtDispatcher::registr(IPA_ADDR_ADD_EVENT, w);
-//#ifdef FEATURE_IPA_ANDROID
-#if 0
+#ifdef FEATURE_IPA_ANDROID
IPACM_EvtDispatcher::registr(IPA_WAN_UPSTREAM_ROUTE_ADD_EVENT, w);
- IPACM_EvtDispatcher::registr(IPA_WAN_UPSTREAM_ROUTE_DEL_EVENT, w);
-#endif
-//#else/* defined(FEATURE_IPA_ANDROID) */
+#else/* defined(FEATURE_IPA_ANDROID) */
IPACM_EvtDispatcher::registr(IPA_ROUTE_ADD_EVENT, w);
IPACM_EvtDispatcher::registr(IPA_ROUTE_DEL_EVENT, w);
-//#endif /* not defined(FEATURE_IPA_ANDROID)*/
+#endif /* not defined(FEATURE_IPA_ANDROID)*/
IPACM_EvtDispatcher::registr(IPA_FIREWALL_CHANGE_EVENT, w);
IPACM_EvtDispatcher::registr(IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT, w);
IPACM_EvtDispatcher::registr(IPA_SW_ROUTING_ENABLE, w);