Factoring out GetDefaultPort

(cherry picked from commit 71a453b8550eda6c513ffeade899c03604e1bbfe)

Source commit: 6afb0b6c81831dc79afe5136b5c69af99d8fae32

source/core/S3FileSystem.cpp

@@ -227,7 +227,7 @@ void __fastcall TS3FileSystem::Open()
 
   FHostName = UTF8String(Data->HostNameExpanded);
   FPortSuffix = UTF8String();
-  int ADefaultPort = DefaultPort(FTerminal->SessionData->FSProtocol, FTerminal->SessionData->Ftps);
+  int ADefaultPort = FTerminal->SessionData->GetDefaultPort();
   DebugAssert(ADefaultPort == HTTPSPortNumber);
   if (FTerminal->SessionData->PortNumber != ADefaultPort)
   {

source/core/SessionData.cpp

@@ -2413,10 +2413,15 @@ bool __fastcall TSessionData::GetCanLogin()
   return !FHostName.IsEmpty();
 }
 //---------------------------------------------------------------------------
+int TSessionData::GetDefaultPort()
+{
+  return DefaultPort(FSProtocol, Ftps);
+}
+//---------------------------------------------------------------------------
 UnicodeString __fastcall TSessionData::GetSessionKey()
 {
   UnicodeString Result = FORMAT(L"%s@%s", (UserName, HostName));
-  if (PortNumber != DefaultPort(FSProtocol, Ftps))
+  if (PortNumber != GetDefaultPort())
   {
     Result += FORMAT(L":%d", (PortNumber));
   }
@@ -3316,7 +3321,7 @@ UnicodeString __fastcall TSessionData::GenerateSessionUrl(unsigned int Flags)
     Url += EncodeUrlString(HostNameExpanded);
   }
 
-  if (PortNumber != DefaultPort(FSProtocol, Ftps))
+  if (PortNumber != GetDefaultPort())
   {
     Url += L":" + IntToStr(PortNumber);
   }
@@ -3533,7 +3538,7 @@ void __fastcall TSessionData::GenerateAssemblyCode(
     AddAssemblyProperty(Head, Language, L"HostName", HostName);
     SessionData->HostName = FactoryDefaults->HostName;
   }
-  int ADefaultPort = DefaultPort(FSProtocol, Ftps);
+  int ADefaultPort = GetDefaultPort();
   if (SessionData->PortNumber != ADefaultPort)
   {
     AddAssemblyProperty(Head, Language, L"PortNumber", PortNumber);

source/core/SessionData.h

@@ -518,6 +518,7 @@ public:
   bool __fastcall HasRawSettingsForUrl();
   bool __fastcall HasSessionName();
   bool HasAutoCredentials();
+  int GetDefaultPort();
 
   UnicodeString __fastcall GenerateOpenCommandArgs(bool Rtf);
   void __fastcall GenerateAssemblyCode(TAssemblyLanguage Language, UnicodeString & Head, UnicodeString & Tail, int & Indent);

source/forms/Custom.cpp

@@ -1525,7 +1525,7 @@ void __fastcall TSiteRawDialog::AddButtonClick(TObject *)
   UnicodeString RandomAppendix(L"_");
   BasicData->HostName = FactoryDefaults->HostName + RandomAppendix;
   BasicData->Ftps = TFtps(FactoryDefaults->Ftps + 1);
-  BasicData->PortNumber = DefaultPort(BasicData->FSProtocol, BasicData->Ftps) + 1;
+  BasicData->PortNumber = BasicData->GetDefaultPort() + 1;
   BasicData->UserName = FactoryDefaults->UserName + RandomAppendix;
   BasicData->Password = FactoryDefaults->Password + RandomAppendix;