From 0c6ec2117a0432b38fd1e47b1c58fb81757bb35b Mon Sep 17 00:00:00 2001 From: Xackery Date: Fri, 30 Dec 2022 08:28:06 -0800 Subject: [PATCH] Added WorldUDP Port --- common/eqemu_config.cpp | 5 +++++ common/eqemu_config.h | 1 + world/main.cpp | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/eqemu_config.cpp b/common/eqemu_config.cpp index 85161ba8a..c22e087be 100644 --- a/common/eqemu_config.cpp +++ b/common/eqemu_config.cpp @@ -86,6 +86,7 @@ void EQEmuConfig::parse_config() if (_root["server"]["world"].get("locked", "false").asString() == "true") { Locked = true; } WorldIP = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString(); WorldTCPPort = atoi(_root["server"]["world"]["tcp"].get("port", "9000").asString().c_str()); + WorldUDPPort = atoi(_root["server"]["world"]["udp"].get("port", "9000").asString().c_str()); TelnetIP = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString(); TelnetTCPPort = atoi(_root["server"]["world"]["telnet"].get("port", "9001").asString().c_str()); @@ -217,6 +218,9 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const if (var_name == "WorldTCPPort") { return (itoa(WorldTCPPort)); } + if (var_name == "WorldUDPPort") { + return (itoa(WorldUDPPort)); + } if (var_name == "WorldIP") { return (WorldIP); } @@ -348,6 +352,7 @@ void EQEmuConfig::Dump() const std::cout << "LoginLegacy = " << LoginLegacy << std::endl; std::cout << "Locked = " << Locked << std::endl; std::cout << "WorldTCPPort = " << WorldTCPPort << std::endl; + std::cout << "WorldUDPPort = " << WorldUDPPort << std::endl; std::cout << "WorldIP = " << WorldIP << std::endl; std::cout << "TelnetTCPPort = " << TelnetTCPPort << std::endl; std::cout << "TelnetIP = " << TelnetIP << std::endl; diff --git a/common/eqemu_config.h b/common/eqemu_config.h index d0434399a..4d435ea6b 100644 --- a/common/eqemu_config.h +++ b/common/eqemu_config.h @@ -51,6 +51,7 @@ class EQEmuConfig LinkedList loginlist; bool Locked; uint16 WorldTCPPort; + uint16 WorldUDPPort; std::string WorldIP; uint16 TelnetTCPPort; std::string TelnetIP; diff --git a/world/main.cpp b/world/main.cpp index 523d98f3e..04c3e261e 100644 --- a/world/main.cpp +++ b/world/main.cpp @@ -337,8 +337,8 @@ int main(int argc, char **argv) ); WorldBoot::CheckForPossibleConfigurationIssues(); - - EQStreamManagerInterfaceOptions opts(9000, false, false); + + EQStreamManagerInterfaceOptions opts(Config->WorldUDPPort, false, false); opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS); opts.daybreak_options.resend_delay_factor = RuleR(Network, ResendDelayFactor); opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS);