Commit 19484aa0 authored by aligungr's avatar aligungr

UE config refactored

parent d3d1b392
...@@ -48,7 +48,7 @@ static nr::gnb::GnbConfig *ReadConfigYaml() ...@@ -48,7 +48,7 @@ static nr::gnb::GnbConfig *ReadConfigYaml()
result->gnbIdLength = yaml::GetInt32(config, "idLength", 22, 32); result->gnbIdLength = yaml::GetInt32(config, "idLength", 22, 32);
result->tac = yaml::GetInt32(config, "tac", 0, 0xFFFFFF); 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->ngapIp = yaml::GetIp(config, "ngapIp");
result->gtpIp = yaml::GetIp4(config, "gtpIp"); result->gtpIp = yaml::GetIp4(config, "gtpIp");
......
...@@ -48,7 +48,7 @@ RlsUdpTask::RlsUdpTask(TaskBase *base, uint64_t sti, Vector3 phyLocation) ...@@ -48,7 +48,7 @@ RlsUdpTask::RlsUdpTask(TaskBase *base, uint64_t sti, Vector3 phyLocation)
try 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) catch (const LibError &e)
{ {
......
...@@ -309,7 +309,7 @@ struct GnbConfig ...@@ -309,7 +309,7 @@ struct GnbConfig
int tac{}; int tac{};
NetworkSlice nssai{}; NetworkSlice nssai{};
std::vector<GnbAmfConfig> amfConfigs{}; std::vector<GnbAmfConfig> amfConfigs{};
std::string portalIp{}; std::string linkIp{};
std::string ngapIp{}; std::string ngapIp{};
std::string gtpIp{}; std::string gtpIp{};
std::optional<std::string> gtpAdvertiseIp{}; std::optional<std::string> gtpAdvertiseIp{};
......
...@@ -33,7 +33,7 @@ RlsUdpTask::RlsUdpTask(TaskBase *base, RlsSharedContext *shCtx, const std::vecto ...@@ -33,7 +33,7 @@ RlsUdpTask::RlsUdpTask(TaskBase *base, RlsSharedContext *shCtx, const std::vecto
m_server = new udp::UdpServer(); m_server = new udp::UdpServer();
for (auto &ip : searchSpace) for (auto &ip : searchSpace)
m_searchSpace.emplace_back(ip, cons::PortalPort); m_searchSpace.emplace_back(ip, cons::RadioLinkPort);
m_simPos = Vector3{}; m_simPos = Vector3{};
} }
......
...@@ -23,7 +23,7 @@ struct cons ...@@ -23,7 +23,7 @@ struct cons
// Some port values // Some port values
static constexpr const uint16_t GtpPort = 2152; static constexpr const uint16_t GtpPort = 2152;
static constexpr const uint16_t PortalPort = 4997; static constexpr const uint16_t RadioLinkPort = 4997;
// TUN interface // TUN interface
static constexpr const char *TunNamePrefix = "uesimtun"; static constexpr const char *TunNamePrefix = "uesimtun";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment