summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiranjan Pendharkar <npendhar@codeaurora.org>2017-10-16 05:51:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-16 05:51:11 +0000
commitfca26c3c4834dacaed51e6dd4adcdf7260b04c6e (patch)
treecacb79087cb949b56478519224737573dbc4ad4d
parent521fc87bc7b2501d356c2d58666a26657a27850f (diff)
parent954374392bfb9ed9f3fb5950e581579cd2671b05 (diff)
downloadipacfg-mgr-fca26c3c4834dacaed51e6dd4adcdf7260b04c6e.tar.gz
IPACM: fix downstream iface list add/del issue am: f7f6aa6be4
am: 954374392b Change-Id: Ie00e285ec6f6a6ccf6449f07f20b7cb420b0fd49
-rw-r--r--msm8998/ipacm/inc/IPACM_OffloadManager.h2
-rw-r--r--msm8998/ipacm/src/IPACM_OffloadManager.cpp17
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<const char *> valid_ifaces;
+ std::list<std::string> 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;
}