summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPankaj Kanwar <pkanwar@google.com>2017-10-16 00:12:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-16 00:12:54 +0000
commit521fc87bc7b2501d356c2d58666a26657a27850f (patch)
tree8673680814bafe922c07f49f4901677491d745ab
parent3b33fcf67b87e439f4be79a2cc2a916c1a25a3c9 (diff)
parent78c15c02606c64b5287ccd8102fb87112a8f0418 (diff)
downloadipacfg-mgr-521fc87bc7b2501d356c2d58666a26657a27850f.tar.gz
Merge "ipacm: fix the VTS error" into oc-mr1-dev am: 0777ebbf64
am: 78c15c0260 Change-Id: I83b4e4cb05055d549992d73b78b2fd3611be2a3d
-rw-r--r--msm8998/ipacm/src/IPACM_OffloadManager.cpp12
1 files changed, 11 insertions, 1 deletions
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 */)