F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify handover management for multiple eNBs (i.e. different cellIds)

Browse Source
This commit is contained in:
Manuel Requena
2012-11-14 16:05:54 +01:00
parent 44f861089e
commit f0f647b9b5
3 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lte/model/epc-x2-sap.h
View File

@@ -137,6 +137,7 @@ public:
{
uint16_t oldEnbUeX2apId;
uint16_t newEnbUeX2apId;
uint16_t sourceCellId;
};
};

27
src/lte/model/epc-x2.cc
View File

@@ -154,7 +154,7 @@ EpcX2::RecvFromX2cSocket (Ptr<Socket> socket)
EpcX2Header x2Header;
packet->RemoveHeader (x2Header);
NS_LOG_LOGIC ("X2 header: " << x2Header);
uint8_t messageType = x2Header.GetMessageType ();
@@ -195,11 +195,6 @@ EpcX2::RecvFromX2cSocket (Ptr<Socket> socket)
NS_ASSERT_MSG (params.targetCellId == cellsInfo->m_localCellId,
"TargetCellId mismatches with localCellId");
// Map oldEnbUeX2apId to sourceCellId
NS_ASSERT_MSG (m_x2Ues.find (params.oldEnbUeX2apId) == m_x2Ues.end (),
"UE already in CellId. enbUeX2apId = " << params.oldEnbUeX2apId << ". CellId = " << params.sourceCellId);
m_x2Ues [params.oldEnbUeX2apId] = params.sourceCellId;
m_x2SapUser->RecvHandoverRequest (params);
}
else // messageType == SuccessfulOutcome
@@ -275,11 +270,6 @@ EpcX2::DoSendHandoverRequest (EpcX2SapProvider::HandoverRequestParams params)
NS_LOG_LOGIC ("sourceSocket = " << sourceSocket);
NS_LOG_LOGIC ("targetIpAddr = " << targetIpAddr);
// Map oldEnbUeX2apId to sourceCellId
NS_ASSERT_MSG (m_x2Ues.find (params.oldEnbUeX2apId) == m_x2Ues.end (),
"UE already in CellId. enbUeX2apId = " << params.oldEnbUeX2apId << ". CellId = " << params.sourceCellId);
m_x2Ues [params.oldEnbUeX2apId] = params.sourceCellId;
NS_LOG_INFO ("Send X2 message: HANDOVER REQUEST");
// Build the X2 message
@@ -367,18 +357,13 @@ EpcX2::DoSendUeContextRelease (EpcX2SapProvider::UeContextReleaseParams params)
NS_LOG_LOGIC ("oldEnbUeX2apId = " << params.oldEnbUeX2apId);
NS_LOG_LOGIC ("newEnbUeX2apId = " << params.newEnbUeX2apId);
NS_LOG_LOGIC ("sourceCellId = " << params.sourceCellId);
NS_ASSERT_MSG (m_x2Ues.find (params.oldEnbUeX2apId) != m_x2Ues.end (),
"Missing CellId for enbUeX2apId = " << params.oldEnbUeX2apId);
uint16_t sourceCellId = m_x2Ues [params.oldEnbUeX2apId];
NS_ASSERT_MSG (m_x2InterfaceSockets.find (params.sourceCellId) != m_x2InterfaceSockets.end (),
"Socket infos not defined for sourceCellId = " << params.sourceCellId);
NS_LOG_LOGIC ("sourceCellId = " << sourceCellId);
NS_ASSERT_MSG (m_x2InterfaceSockets.find (sourceCellId) != m_x2InterfaceSockets.end (),
"Socket infos not defined for sourceCellId = " << sourceCellId);
Ptr<Socket> localSocket = m_x2InterfaceSockets [sourceCellId]->m_localSocket;
Ipv4Address remoteIpAddr = m_x2InterfaceSockets [sourceCellId]->m_remoteIpAddr;
Ptr<Socket> localSocket = m_x2InterfaceSockets [params.sourceCellId]->m_localSocket;
Ipv4Address remoteIpAddr = m_x2InterfaceSockets [params.sourceCellId]->m_remoteIpAddr;
NS_LOG_LOGIC ("localSocket = " << localSocket);
NS_LOG_LOGIC ("remoteIpAddr = " << remoteIpAddr);

5
src/lte/model/epc-x2.h
View File

@@ -120,11 +120,6 @@ protected:
private:
/**
* Map the enbUeX2apId to the corresponding cellId where the UE is camping on
*/
std::map < uint16_t, uint16_t > m_x2Ues;
/**
* Map the targetCellId to the corresponding (sourceSocket, remoteIpAddr) to be used
* to send the X2 message