ProxyMethod raw session setting supports symbolical value names

Source commit: 0f00739cec07a65621abdb5fdb33b396c13563db

source/core/HierarchicalStorage.cpp

@@ -129,6 +129,20 @@ TIntMapping CreateIntMapping(
   return Result;
 }
 //---------------------------------------------------------------------------
+TIntMapping CreateIntMappingFromEnumNames(const UnicodeString & ANames)
+{
+  UnicodeString Names(ANames);
+  TIntMapping Result;
+  int Index = 0;
+  while (!Names.IsEmpty())
+  {
+    UnicodeString Name = CutToChar(Names, L';', true);
+    Result.insert(std::make_pair(Name, Index));
+    Index++;
+  }
+  return Result;
+}
+//---------------------------------------------------------------------------
 TIntMapping AutoSwitchMapping = CreateIntMapping(L"on", asOn, L"off", asOff, L"auto", asAuto);
 TIntMapping AutoSwitchReversedMapping = CreateIntMapping(L"on", asOff, L"off", asOn, L"auto", asAuto);
 TIntMapping BoolMapping = CreateIntMapping(L"on", true, L"off", false);

source/core/HierarchicalStorage.h

@@ -282,5 +282,6 @@ protected:
 //---------------------------------------------------------------------------
 UnicodeString __fastcall PuttyMungeStr(const UnicodeString & Str);
 AnsiString PuttyStr(const UnicodeString & Str);
+TIntMapping CreateIntMappingFromEnumNames(const UnicodeString & Names);
 //---------------------------------------------------------------------------
 #endif

source/core/SessionData.cpp

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 const wchar_t * PingTypeNames = L"Off;Null;Dummy";
 const wchar_t * ProxyMethodNames = L"None;SOCKS4;SOCKS5;HTTP;Telnet;Cmd";
+TIntMapping ProxyMethodMapping = CreateIntMappingFromEnumNames(LowerCase(ProxyMethodNames));
 const wchar_t * DefaultName = L"Default Settings";
 const UnicodeString CipherNames[CIPHER_COUNT] = {L"WARN", L"3des", L"blowfish", L"aes", L"des", L"arcfour", L"chacha20", "aesgcm"};
 const UnicodeString KexNames[KEX_COUNT] = {L"WARN", L"dh-group1-sha1", L"dh-group14-sha1", L"dh-group15-sha512", L"dh-group16-sha512", L"dh-group17-sha512", L"dh-group18-sha512", L"dh-gex-sha1", L"rsa", L"ecdh", L"ntru-curve25519"};
@@ -799,7 +800,7 @@ void __fastcall TSessionData::DoLoad(THierarchicalStorage * Storage, bool PuttyI
   ProtocolFeatures = Storage->ReadString(L"ProtocolFeatures", ProtocolFeatures);
   SshSimple = Storage->ReadBool(L"SshSimple", SshSimple);
 
-  ProxyMethod = (TProxyMethod)Storage->ReadInteger(L"ProxyMethod", ProxyMethod);
+  ProxyMethod = Storage->ReadEnum(L"ProxyMethod", ProxyMethod, ProxyMethodMapping);
   ProxyHost = Storage->ReadString(L"ProxyHost", ProxyHost);
   ProxyPort = Storage->ReadInteger(L"ProxyPort", ProxyPort);
   ProxyUsername = Storage->ReadString(L"ProxyUsername", ProxyUsername);