UE config refactored

aligungr · Dec 7, 2021 · 19484aa · 19484aa
1 parent d3d1b39
commit 19484aa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/gnb.cpp b/src/gnb.cpp
@@ -48,7 +48,7 @@ static nr::gnb::GnbConfig *ReadConfigYaml()
     result->gnbIdLength = yaml::GetInt32(config, "idLength", 22, 32);
     result->tac = yaml::GetInt32(config, "tac", 0, 0xFFFFFF);
 
-    result->portalIp = yaml::GetIp(config, "linkIp");
+    result->linkIp = yaml::GetIp(config, "linkIp");
     result->ngapIp = yaml::GetIp(config, "ngapIp");
     result->gtpIp = yaml::GetIp4(config, "gtpIp");
 

diff --git a/src/gnb/rls/udp_task.cpp b/src/gnb/rls/udp_task.cpp
@@ -48,7 +48,7 @@ RlsUdpTask::RlsUdpTask(TaskBase *base, uint64_t sti, Vector3 phyLocation)
 
     try
     {
-        m_server = new udp::UdpServer(base->config->portalIp, cons::PortalPort);
+        m_server = new udp::UdpServer(base->config->linkIp, cons::RadioLinkPort);
     }
     catch (const LibError &e)
     {

diff --git a/src/gnb/types.hpp b/src/gnb/types.hpp
@@ -309,7 +309,7 @@ struct GnbConfig
     int tac{};
     NetworkSlice nssai{};
     std::vector<GnbAmfConfig> amfConfigs{};
-    std::string portalIp{};
+    std::string linkIp{};
     std::string ngapIp{};
     std::string gtpIp{};
     std::optional<std::string> gtpAdvertiseIp{};

diff --git a/src/ue/rls/udp_task.cpp b/src/ue/rls/udp_task.cpp
@@ -33,7 +33,7 @@ RlsUdpTask::RlsUdpTask(TaskBase *base, RlsSharedContext *shCtx, const std::vecto
     m_server = new udp::UdpServer();
 
     for (auto &ip : searchSpace)
-        m_searchSpace.emplace_back(ip, cons::PortalPort);
+        m_searchSpace.emplace_back(ip, cons::RadioLinkPort);
 
     m_simPos = Vector3{};
 }

diff --git a/src/utils/constants.hpp b/src/utils/constants.hpp
@@ -23,7 +23,7 @@ struct cons
 
     // Some port values
     static constexpr const uint16_t GtpPort = 2152;
-    static constexpr const uint16_t PortalPort = 4997;
+    static constexpr const uint16_t RadioLinkPort = 4997;
 
     // TUN interface
     static constexpr const char *TunNamePrefix = "uesimtun";
-Original file line number
+Diff line change
@@ Expand Up @@
         try
         {
-            m_server = new udp::UdpServer(base->config->portalIp, cons::PortalPort);
+            m_server = new udp::UdpServer(base->config->linkIp, cons::RadioLinkPort);
         }
         catch (const LibError &e)
         {
@@ Expand Down @@