Merge pull request #465 from EpicGames/zs/default-port-change

Change default port to 8558

9 files changed, 13 insertions, 13 deletions

diff --git a/src/transports/winsock/winsock.cpp b/src/transports/winsock/winsock.cpp
index a6cfed1e3..25e46b2fb 100644
--- a/src/transports/winsock/winsock.cpp
+++ b/src/transports/winsock/winsock.cpp
@@ -320,7 +320,7 @@ SocketTransportPlugin::IsAvailable()
 TransportPlugin*
 CreateTransportPlugin()
 {
-	return new SocketTransportPlugin(1337, 8);
+	return new SocketTransportPlugin(8558, 8);
 }
 
 BOOL WINAPI
diff --git a/src/zen/cmds/up_cmd.cpp b/src/zen/cmds/up_cmd.cpp
index b07fb6ec8..cb8bd8ecf 100644
--- a/src/zen/cmds/up_cmd.cpp
+++ b/src/zen/cmds/up_cmd.cpp
@@ -75,7 +75,7 @@ UpCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 
 AttachCommand::AttachCommand()
 {
-	m_Options.add_option("", "p", "port", "Host port", cxxopts::value(m_Port)->default_value("1337"), "<hostport>");
+	m_Options.add_option("", "p", "port", "Host port", cxxopts::value(m_Port)->default_value("8558"), "<hostport>");
 	m_Options.add_option("lifetime", "", "owner-pid", "Specify owning process id", cxxopts::value(m_OwnerPid), "<identifier>");
 }
 
@@ -114,7 +114,7 @@ AttachCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 
 DownCommand::DownCommand()
 {
-	m_Options.add_option("", "p", "port", "Host port", cxxopts::value(m_Port)->default_value("1337"), "<hostport>");
+	m_Options.add_option("", "p", "port", "Host port", cxxopts::value(m_Port)->default_value("8558"), "<hostport>");
 }
 
 DownCommand::~DownCommand() = default;
diff --git a/src/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp
index eb13f77fc..7ea7cf91d 100644
--- a/src/zenhttp/httpserver.cpp
+++ b/src/zenhttp/httpserver.cpp
@@ -767,17 +767,17 @@ CreateHttpServer(const HttpServerConfig& Config)
 				Ref<HttpPluginServer> Server{new HttpPluginServer(Config.ThreadCount)};
 
 #	if 1
-				Ref<TransportPlugin> WinsockPlugin{CreateSocketTransportPlugin(1337, Config.ThreadCount)};
+				Ref<TransportPlugin> WinsockPlugin{CreateSocketTransportPlugin(8558, Config.ThreadCount)};
 				Server->AddPlugin(WinsockPlugin);
 #	endif
 
 #	if 0
-				Ref<TransportPlugin> AsioPlugin{CreateAsioTransportPlugin(1337, Config.ThreadCount)};
+				Ref<TransportPlugin> AsioPlugin{CreateAsioTransportPlugin(8558, Config.ThreadCount)};
 				Server->AddPlugin(AsioPlugin);
 #	endif
 
 #	if 0
-				Ref<DllTransportPlugin> DllPlugin{new DllTransportPlugin(1337, Config.ThreadCount)};
+				Ref<DllTransportPlugin> DllPlugin{new DllTransportPlugin(8558, Config.ThreadCount)};
 				DllPlugin->LoadDll("winsock");
 				Server->AddPlugin(DllPlugin);
 #	endif
diff --git a/src/zenhttp/httpsys.cpp b/src/zenhttp/httpsys.cpp
index 75d8bfe7a..c1b4717cb 100644
--- a/src/zenhttp/httpsys.cpp
+++ b/src/zenhttp/httpsys.cpp
@@ -1026,7 +1026,7 @@ HttpSysServer::InitializeServer(int BasePort)
 		// remote origin requests to function.  This can be remedied by using netsh
 		// during an install process to grant permissions to route public access to the appropriate
 		// port for the current user.  eg:
-		// netsh http add urlacl url=http://*:1337/ user=<some_user>
+		// netsh http add urlacl url=http://*:8558/ user=<some_user>
 
 		ZEN_WARN("Unable to register handler using '{}' - falling back to local-only", WideToUtf8(WildcardUrlPath));
 
diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp
index cdd1fb031..9112222d6 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
@@ -1011,7 +1011,7 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 					   "p",
 					   "port",
 					   "Select HTTP port",
-					   cxxopts::value<int>(ServerOptions.BasePort)->default_value("1337"),
+					   cxxopts::value<int>(ServerOptions.BasePort)->default_value("8558"),
 					   "<port number>");
 
 	options.add_option("httpsys",
diff --git a/src/zenserver/config.h b/src/zenserver/config.h
index d3b20218f..fecf3fe0c 100644
--- a/src/zenserver/config.h
+++ b/src/zenserver/config.h
@@ -123,7 +123,7 @@ struct ZenServerOptions
 	std::string				 LogId;						  // Id for tagging log output
 	std::string				 EncryptionKey;				  // 256 bit AES encryption key
 	std::string				 EncryptionIV;				  // 128 bit AES initialization vector
-	int						 BasePort			= 1337;	  // Service listen port (used for both UDP and TCP)
+	int						 BasePort			= 8558;	  // Service listen port (used for both UDP and TCP)
 	int						 OwnerPid			= 0;	  // Parent process id (zero for standalone)
 	bool					 InstallService		= false;  // Flag used to initiate service install (temporary)
 	bool					 UninstallService	= false;  // Flag used to initiate service uninstall (temporary)
diff --git a/src/zenserver/objectstore/objectstore.h b/src/zenserver/objectstore/objectstore.h
index eaab57794..0fec59b03 100644
--- a/src/zenserver/objectstore/objectstore.h
+++ b/src/zenserver/objectstore/objectstore.h
@@ -21,7 +21,7 @@ struct ObjectStoreConfig
 
 	std::filesystem::path	  RootDirectory;
 	std::vector<BucketConfig> Buckets;
-	uint16_t				  ServerPort{1337};
+	uint16_t				  ServerPort{8558};
 };
 
 class HttpObjectStoreService final : public zen::HttpService
diff --git a/src/zenserver/vfs/vfsservice.cpp b/src/zenserver/vfs/vfsservice.cpp
index c53682d93..04ba29ed2 100644
--- a/src/zenserver/vfs/vfsservice.cpp
+++ b/src/zenserver/vfs/vfsservice.cpp
@@ -58,8 +58,8 @@ GetContentAsCbObject(HttpServerRequest& HttpReq, CbObject& Cb)
 //
 // to test:
 //
-// echo {"method": "mount", "params": {"path": "d:\\VFS_ROOT"}} | curl.exe http://localhost:1337/vfs --data-binary @-
-// echo {"method": "unmount"} | curl.exe http://localhost:1337/vfs --data-binary @-
+// echo {"method": "mount", "params": {"path": "d:\\VFS_ROOT"}} | curl.exe http://localhost:8558/vfs --data-binary @-
+// echo {"method": "unmount"} | curl.exe http://localhost:8558/vfs --data-binary @-
 
 VfsService::VfsService()
 {
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 789952a3c..b1e661973 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -451,7 +451,7 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 				{
 					if (!Dns.empty())
 					{
-						const asio::error_code Err = utils::ResolveHostname(m_IoContext, Dns, "1337"sv, ZenUrls);
+						const asio::error_code Err = utils::ResolveHostname(m_IoContext, Dns, "8558"sv, ZenUrls);
 						if (Err)
 						{
 							ZEN_ERROR("resolve FAILED, reason '{}'", Err.message());