From 28e7f824301c3d5724338f71bb2e5f83d7fcb79c Mon Sep 17 00:00:00 2001 From: Niranjan Pendharkar Date: Sat, 14 Oct 2017 20:06:30 -0700 Subject: ipacm: fix the VTS error On VTS IPACM_HAL unit-test, since wlan tethering devive won't up, therefore the addDownsream events are all cached in IPACM_HAL and keep accumulated until reaching IPACM's max cached and seeing test-case starts failing. The fix is to clean up the cache on Stopoffload. CRs-fixed:2118600 Bug:65612227 Test: compile Change-Id: I24f410f5c5ae3a6cad0e14293f266b067f643389 Signed-off-by: Skylar Chang Signed-off-by: Niranjan Pendharkar (cherry picked from commit 5cf0a7159b173f627128cf87877a3e559a558f81) --- msm8998/ipacm/src/IPACM_OffloadManager.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/msm8998/ipacm/src/IPACM_OffloadManager.cpp b/msm8998/ipacm/src/IPACM_OffloadManager.cpp index ca54ea6..32606b9 100644 --- a/msm8998/ipacm/src/IPACM_OffloadManager.cpp +++ b/msm8998/ipacm/src/IPACM_OffloadManager.cpp @@ -493,12 +493,22 @@ RET IPACM_OffloadManager::setUpstream(const char *upstream_name, const Prefix& g RET IPACM_OffloadManager::stopAllOffload() { Prefix v4gw, v6gw; + RET result = SUCCESS; + memset(&v4gw, 0, sizeof(v4gw)); memset(&v6gw, 0, sizeof(v6gw)); v4gw.fam = V4; v6gw.fam = V6; IPACMDBG_H("posting setUpstream(NULL), ipv4-fam(%d) ipv6-fam(%d)\n", v4gw.fam, v6gw.fam); - return setUpstream(NULL, v4gw, v6gw); + result = setUpstream(NULL, v4gw, v6gw); + + /* reset the event cache */ + default_gw_index = INVALID_IFACE; + upstream_v4_up = false; + upstream_v6_up = false; + memset(event_cache, 0, MAX_EVENT_CACHE*sizeof(framework_event_cache)); + latest_cache_index = 0; + return result; } RET IPACM_OffloadManager::setQuota(const char * upstream_name /* upstream */, uint64_t mb/* limit */) -- cgit v1.2.3 From 541f806409a2695f10e789f520917e1ea62f0edc Mon Sep 17 00:00:00 2001 From: Niranjan Pendharkar Date: Sat, 14 Oct 2017 19:40:34 -0700 Subject: IPA HAL: fix the upstream down issue When upstream interface went down but tethered interface still up, send "NULL" upstream iface name to IPACM to clean up previous up upstream interface. CRs-fixed:2125887 Bug:67396342 Test: compile Change-Id: Ic586072721f9a053126ae0e6a54a00c196632a35 Signed-off-by: Skylar Chang Signed-off-by: Niranjan Pendharkar (cherry picked from commit 4b09d0b7556d2bbd8da714a9a8b51ebd6cf5a061) --- msm8998/hal/src/HAL.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/msm8998/hal/src/HAL.cpp b/msm8998/hal/src/HAL.cpp index 59f978d..e19a149 100644 --- a/msm8998/hal/src/HAL.cpp +++ b/msm8998/hal/src/HAL.cpp @@ -506,8 +506,7 @@ Return HAL::setUpstreamParameters BoolResult res = makeInputCheckFailure("Not initialized (setUpstreamParameters)"); hidl_cb(res.success, res.errMsg); fl.setResult(res.success, res.errMsg); - } - else if (!v4AddrParser.addV4(v4Addr) && !v4Addr.empty()) { + } else if (!v4AddrParser.addV4(v4Addr) && !v4Addr.empty()) { BoolResult res = makeInputCheckFailure(v4AddrParser.getLastErrAsStr()); hidl_cb(res.success, res.errMsg); fl.setResult(res.success, res.errMsg); @@ -519,7 +518,7 @@ Return HAL::setUpstreamParameters BoolResult res = makeInputCheckFailure(v6GwParser.getLastErrAsStr()); hidl_cb(res.success, res.errMsg); fl.setResult(res.success, res.errMsg); - } else { + } else if (iface.size()>= 1) { RET ipaReturn = mIPA->setUpstream( iface.c_str(), v4GwParser.getFirstPrefix(), @@ -527,6 +526,15 @@ Return HAL::setUpstreamParameters BoolResult res = ipaResultToBoolResult(ipaReturn); hidl_cb(res.success, res.errMsg); fl.setResult(res.success, res.errMsg); + } else { + /* send NULL iface string when upstream down */ + RET ipaReturn = mIPA->setUpstream( + NULL, + v4GwParser.getFirstPrefix(), + v6GwParser.getFirstPrefix()); + BoolResult res = ipaResultToBoolResult(ipaReturn); + hidl_cb(res.success, res.errMsg); + fl.setResult(res.success, res.errMsg); } mLogs.addLog(fl); -- cgit v1.2.3 From f7f6aa6be49a5359bc3393fc574d8825d3f420a9 Mon Sep 17 00:00:00 2001 From: Niranjan Pendharkar Date: Sat, 14 Oct 2017 20:09:29 -0700 Subject: IPACM: fix downstream iface list add/del issue Use std string instead of memory comparison for vts test CRs-fixed:2125887 Bug:67396342 Test: compile Change-Id: I23ac0b27a1aedf340600b28f0b5d75e2e2b8b6f4 Signed-off-by: Skylar Chang Signed-off-by: Niranjan Pendharkar (cherry picked from commit 8caa3afcb5feaa8193639c9eedee1744e5968672) --- msm8998/ipacm/inc/IPACM_OffloadManager.h | 2 +- msm8998/ipacm/src/IPACM_OffloadManager.cpp | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/msm8998/ipacm/inc/IPACM_OffloadManager.h b/msm8998/ipacm/inc/IPACM_OffloadManager.h index 72070dd..bade0aa 100644 --- a/msm8998/ipacm/inc/IPACM_OffloadManager.h +++ b/msm8998/ipacm/inc/IPACM_OffloadManager.h @@ -96,7 +96,7 @@ public: private: - std::list valid_ifaces; + std::list valid_ifaces; bool upstream_v4_up; diff --git a/msm8998/ipacm/src/IPACM_OffloadManager.cpp b/msm8998/ipacm/src/IPACM_OffloadManager.cpp index 32606b9..2061fd2 100644 --- a/msm8998/ipacm/src/IPACM_OffloadManager.cpp +++ b/msm8998/ipacm/src/IPACM_OffloadManager.cpp @@ -212,6 +212,13 @@ RET IPACM_OffloadManager::addDownstream(const char * downstream_name, const Pref IPACMERR("fail to get iface index.\n"); return FAIL_INPUT_CHECK; } + /* Iface is valid, add to list if not present */ + if (std::find(valid_ifaces.begin(), valid_ifaces.end(), std::string(downstream_name)) == valid_ifaces.end()) + { + /* Iface is new, add it to the list */ + valid_ifaces.push_back(downstream_name); + IPACMDBG_H("add iface(%s) to list\n", downstream_name); + } /* check if downstream netdev driver finished its configuration on IPA-HW */ if (IPACM_Iface::ipacmcfg->CheckNatIfaces(downstream_name)) @@ -263,13 +270,6 @@ RET IPACM_OffloadManager::addDownstream(const char * downstream_name, const Pref return SUCCESS; } - /* Iface is valid, add to list if not present */ - if (std::find(valid_ifaces.begin(), valid_ifaces.end(), downstream_name) == valid_ifaces.end()) - { - /* Iface is new, add it to the list */ - valid_ifaces.push_back(downstream_name); - } - evt_data = (ipacm_event_ipahal_stream*)malloc(sizeof(ipacm_event_ipahal_stream)); if(evt_data == NULL) { @@ -303,7 +303,7 @@ RET IPACM_OffloadManager::removeDownstream(const char * downstream_name, const P IPACMERR("iface length is 0.\n"); return FAIL_HARDWARE; } - if (std::find(valid_ifaces.begin(), valid_ifaces.end(), downstream_name) == valid_ifaces.end()) + if (std::find(valid_ifaces.begin(), valid_ifaces.end(), std::string(downstream_name)) == valid_ifaces.end()) { IPACMERR("iface is not present in list.\n"); return FAIL_HARDWARE; @@ -508,6 +508,7 @@ RET IPACM_OffloadManager::stopAllOffload() upstream_v6_up = false; memset(event_cache, 0, MAX_EVENT_CACHE*sizeof(framework_event_cache)); latest_cache_index = 0; + valid_ifaces.clear(); return result; } -- cgit v1.2.3