lte: (fixes #106) IMSI is a uint64_t

AbdullahBay · Dec 12, 2019 · 553a9fb · 553a9fb
1 parent eed73f5
commit 553a9fb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/lte/model/epc-gtpc-header.cc b/src/lte/model/epc-gtpc-header.cc
@@ -874,14 +874,14 @@ GtpcModifyBearerRequestMessage::Print (std::ostream &os) const
   os << " imsi " << m_imsi << " uliEcgi " << m_uliEcgi;
 }
 
-uint8_t
+uint64_t
 GtpcModifyBearerRequestMessage::GetImsi () const
 {
   return m_imsi;
 }
 
 void
-GtpcModifyBearerRequestMessage::SetImsi (uint8_t imsi)
+GtpcModifyBearerRequestMessage::SetImsi (uint64_t imsi)
 {
   m_imsi = imsi;
 }

diff --git a/src/lte/model/epc-gtpc-header.h b/src/lte/model/epc-gtpc-header.h
@@ -334,8 +334,8 @@ class GtpcModifyBearerRequestMessage : public GtpcHeader, public GtpcIes
   virtual void Print (std::ostream &os) const;
   virtual uint32_t GetMessageSize (void) const;
 
-  uint8_t GetImsi () const;
-  void SetImsi (uint8_t imsi);
+  uint64_t GetImsi () const;
+  void SetImsi (uint64_t imsi);
 
   uint32_t GetUliEcgi () const;
   void SetUliEcgi (uint32_t uliEcgi);

diff --git a/src/lte/model/epc-pgw-application.cc b/src/lte/model/epc-pgw-application.cc
@@ -290,7 +290,7 @@ EpcPgwApplication::DoRecvCreateSessionRequest (Ptr<Packet> packet)
   packet->RemoveHeader (msg);
   uint64_t imsi = msg.GetImsi ();
   uint16_t cellId = msg.GetUliEcgi ();
-  NS_LOG_DEBUG ("cellId " << cellId << " imsi " << (uint16_t)imsi);
+  NS_LOG_DEBUG ("cellId " << cellId << " IMSI " << imsi);
 
   std::map<uint64_t, Ptr<UeInfo> >::iterator ueit = m_ueInfoByImsiMap.find (imsi);
   NS_ASSERT_MSG (ueit != m_ueInfoByImsiMap.end (), "unknown IMSI " << imsi);
@@ -351,9 +351,9 @@ EpcPgwApplication::DoRecvModifyBearerRequest (Ptr<Packet> packet)
 
   GtpcModifyBearerRequestMessage msg;
   packet->RemoveHeader (msg);
-  uint8_t imsi = msg.GetImsi ();
+  uint64_t imsi = msg.GetImsi ();
   uint16_t cellId = msg.GetUliEcgi ();
-  NS_LOG_DEBUG ("cellId " << cellId << "IMSI " << (uint16_t)imsi);
+  NS_LOG_DEBUG ("cellId " << cellId << " IMSI " << imsi);
 
   std::map<uint64_t, Ptr<UeInfo> >::iterator ueit = m_ueInfoByImsiMap.find (imsi);
   NS_ASSERT_MSG (ueit != m_ueInfoByImsiMap.end (), "unknown IMSI " << imsi); 

diff --git a/src/lte/model/epc-sgw-application.cc b/src/lte/model/epc-sgw-application.cc
@@ -231,9 +231,9 @@ EpcSgwApplication::DoRecvCreateSessionRequest (Ptr<Packet> packet)
 
   GtpcCreateSessionRequestMessage msg;
   packet->RemoveHeader (msg);
-  uint8_t imsi = msg.GetImsi ();
+  uint64_t imsi = msg.GetImsi ();
   uint16_t cellId = msg.GetUliEcgi ();
-  NS_LOG_DEBUG ("IMSI " << (uint16_t)imsi << " cellId " << cellId);
+  NS_LOG_DEBUG ("cellId " << cellId << " IMSI " << imsi);
 
   std::map<uint16_t, EnbInfo>::iterator enbit = m_enbInfoByCellId.find (cellId);
   NS_ASSERT_MSG (enbit != m_enbInfoByCellId.end (), "unknown CellId " << cellId); 
@@ -298,9 +298,9 @@ EpcSgwApplication::DoRecvModifyBearerRequest (Ptr<Packet> packet)
 
   GtpcModifyBearerRequestMessage msg;
   packet->RemoveHeader (msg);
-  uint8_t imsi = msg.GetImsi ();
+  uint64_t imsi = msg.GetImsi ();
   uint16_t cellId = msg.GetUliEcgi ();
-  NS_LOG_DEBUG ("IMSI " << (uint16_t)imsi << " cellId " << cellId);
+  NS_LOG_DEBUG ("cellId " << cellId << " IMSI " << imsi);
 
   std::map<uint16_t, EnbInfo>::iterator enbit = m_enbInfoByCellId.find (cellId);
   NS_ASSERT_MSG (enbit != m_enbInfoByCellId.end (), "unknown CellId " << cellId);