Index: src/lte/helper/phy-rx-stats-calculator.cc |
=================================================================== |
--- a/src/lte/helper/phy-rx-stats-calculator.cc |
+++ b/src/lte/helper/phy-rx-stats-calculator.cc |
@@ -184,13 +184,15 @@ |
uint64_t imsi = 0; |
std::ostringstream pathAndRnti; |
pathAndRnti << path << "/" << params.m_rnti; |
+ std::string pathUePhy = path.substr (0, path.find ("/ComponentCarrierMapUe")); |
if (phyRxStats->ExistsImsiPath (pathAndRnti.str ()) == true) |
{ |
imsi = phyRxStats->GetImsiPath (pathAndRnti.str ()); |
} |
else |
{ |
- imsi = FindImsiForUe (path, params.m_rnti); |
+ // imsi = FindImsiForUe (path, params.m_rnti); |
+ imsi = FindImsiFromLteNetDevice (pathUePhy); |
phyRxStats->SetImsiPath (pathAndRnti.str (), imsi); |
} |
@@ -205,14 +207,17 @@ |
NS_LOG_FUNCTION (phyRxStats << path); |
uint64_t imsi = 0; |
std::ostringstream pathAndRnti; |
- pathAndRnti << path << "/" << params.m_rnti; |
+ // pathAndRnti << path << "/" << params.m_rnti; |
+ std::string pathEnb = path.substr (0, path.find ("/ComponentCarrierMap")); |
+ pathAndRnti << pathEnb << "/LteEnbRrc/UeMap/" << params.m_rnti; |
if (phyRxStats->ExistsImsiPath (pathAndRnti.str ()) == true) |
{ |
imsi = phyRxStats->GetImsiPath (pathAndRnti.str ()); |
} |
else |
{ |
- imsi = FindImsiForEnb (path, params.m_rnti); |
+ // imsi = FindImsiForEnb (path, params.m_rnti); |
+ imsi = FindImsiFromEnbRlcPath (pathAndRnti.str ()); |
phyRxStats->SetImsiPath (pathAndRnti.str (), imsi); |
} |