From 0a1689ae104c307c437ce71216b16c71727215eb Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 20 Jun 2021 01:40:54 +0800 Subject: [PATCH] Adjust default ports from 49xxx range to 43xxx range --- nel/src/net/admin.cpp | 2 +- nel/src/net/login_client.cpp | 2 +- .../game_share/_backup_service_interface_non_module.cpp | 8 ++++---- ryzom/server/src/backup_service/backup_service.cpp | 4 ++-- .../server/src/mail_forum_service/mail_forum_service.cpp | 2 +- .../src/ryzom_welcome_service/ryzom_welcome_service.cpp | 2 +- ryzom/server/src/server_share/mail_forum_validator.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nel/src/net/admin.cpp b/nel/src/net/admin.cpp index 4389e0f34..268abdc55 100644 --- a/nel/src/net/admin.cpp +++ b/nel/src/net/admin.cpp @@ -612,7 +612,7 @@ void initAdmin (bool dontUseAES) { CUnifiedNetwork::getInstance()->setServiceUpCallback ("AES", cbAESConnection, NULL); CUnifiedNetwork::getInstance()->setServiceDownCallback ("AES", cbAESDisconnection, NULL); - CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:49997")); + CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:43997")); } CUnifiedNetwork::getInstance()->addCallbackArray (CallbackArray, sizeof(CallbackArray)/sizeof(CallbackArray[0])); } diff --git a/nel/src/net/login_client.cpp b/nel/src/net/login_client.cpp index 0f4383e16..888597418 100644 --- a/nel/src/net/login_client.cpp +++ b/nel/src/net/login_client.cpp @@ -141,7 +141,7 @@ string CLoginClient::authenticateBegin(const string &loginServiceAddr, const ucs string addr = loginServiceAddr; if(addr.find(":") == string::npos) - addr += ":49997"; + addr += ":43997"; if(_LSCallbackClient->connected()) _LSCallbackClient->disconnect(); _LSCallbackClient->connect (CInetAddress(addr)); diff --git a/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp b/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp index c7993aae3..b32221a11 100644 --- a/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp +++ b/ryzom/common/src/game_share/_backup_service_interface_non_module.cpp @@ -391,7 +391,7 @@ void CBSIINonModule::activate() return; } if (host.find (":") == string::npos) - host+= ":49990"; + host+= ":43990"; _BSMasterAddress = CInetAddress(host); CUnifiedNetwork::getInstance()->addService ("BS", _BSMasterAddress); @@ -401,7 +401,7 @@ void CBSIINonModule::activate() if (!host.empty()) { if (host.find (":") == string::npos) - host+= ":49990"; + host+= ":43990"; _BSSlaveAddress = CInetAddress(host); CUnifiedNetwork::getInstance()->addService ("BS", _BSSlaveAddress); @@ -413,7 +413,7 @@ void CBSIINonModule::activate() // if (_HaveSeparatePDBS) // { // if (host.find (":") == string::npos) -// host+= ":49990"; +// host+= ":43990"; // CUnifiedNetwork::getInstance()->addService ("PDBS", CInetAddress(host)); // // // connect to the global slave bs if any @@ -421,7 +421,7 @@ void CBSIINonModule::activate() // if (!host.empty()) // { // if (host.find (":") == string::npos) -// host+= ":49990"; +// host+= ":43990"; // CUnifiedNetwork::getInstance()->addService ("PDBS", CInetAddress(host)); // } // } diff --git a/ryzom/server/src/backup_service/backup_service.cpp b/ryzom/server/src/backup_service/backup_service.cpp index 08ae61701..8fd93d062 100644 --- a/ryzom/server/src/backup_service/backup_service.cpp +++ b/ryzom/server/src/backup_service/backup_service.cpp @@ -723,7 +723,7 @@ void CBackupService::init() // I'm a slave, try to contact master string host = MasterBSHost.get(); if (host.find (":") == string::npos) - host += ":49990"; + host += ":43990"; CUnifiedNetwork::getInstance()->addService ("BS", CInetAddress(host)); } @@ -774,7 +774,7 @@ static const char* getShortServiceName(const IService* theService, const char *d return s.c_str(); } -NLNET_SERVICE_MAIN( CBackupService, getShortServiceName(scn, "BS"), getCompleteServiceName(scn, "backup_service"), 49990, CbArray, "", "" ) +NLNET_SERVICE_MAIN( CBackupService, getShortServiceName(scn, "BS"), getCompleteServiceName(scn, "backup_service"), 43990, CbArray, "", "" ) void CDirectoryRateStat::clear() diff --git a/ryzom/server/src/mail_forum_service/mail_forum_service.cpp b/ryzom/server/src/mail_forum_service/mail_forum_service.cpp index e2344932b..051287039 100644 --- a/ryzom/server/src/mail_forum_service/mail_forum_service.cpp +++ b/ryzom/server/src/mail_forum_service/mail_forum_service.cpp @@ -129,7 +129,7 @@ TUnifiedCallbackItem CbArray[]= { "CHANGE_UNAME", CMailForumService::cbChangeUserName }, }; -NLNET_SERVICE_MAIN( CMailForumService, "MFS", "mail_forum_service", 49980, CbArray, "", "" ) +NLNET_SERVICE_MAIN( CMailForumService, "MFS", "mail_forum_service", 43980, CbArray, "", "" ) diff --git a/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp b/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp index 493c2bcd1..d456e06df 100644 --- a/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp +++ b/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.cpp @@ -1291,7 +1291,7 @@ public: // add default port if not set by the config file if (LSAddr.find (":") == string::npos) - LSAddr += ":49999"; + LSAddr += ":43999"; AllowDispatchMsgToLS = true; diff --git a/ryzom/server/src/server_share/mail_forum_validator.cpp b/ryzom/server/src/server_share/mail_forum_validator.cpp index b2eab2a3d..daec5f107 100644 --- a/ryzom/server/src/server_share/mail_forum_validator.cpp +++ b/ryzom/server/src/server_share/mail_forum_validator.cpp @@ -229,7 +229,7 @@ bool CMailForumValidator::init() { string host = hostvar->asString(); if (host.find (":") == string::npos) - host+= ":49980"; + host+= ":43980"; CUnifiedNetwork::getInstance()->addService("MFS", CInetAddress(host)); // warning: can call the serviceUp callback => initMFS() again }