summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/AccountController.cpp')
-rw-r--r--Swift/Controllers/AccountController.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/Swift/Controllers/AccountController.cpp b/Swift/Controllers/AccountController.cpp
index 27655c0..b877ce9 100644
--- a/Swift/Controllers/AccountController.cpp
+++ b/Swift/Controllers/AccountController.cpp
@@ -840,18 +840,18 @@ void AccountController::handleQuitRequest() {
840 840
841std::string AccountController::serializeClientOptions(const ClientOptions& options) { 841std::string AccountController::serializeClientOptions(const ClientOptions& options) {
842 std::string result; 842 std::string result;
843 SERIALIZE_BOOL(useStreamCompression); 843 SERIALIZE_BOOL(useStreamCompression)
844 switch (options.useTLS) { 844 switch (options.useTLS) {
845 case ClientOptions::NeverUseTLS: result += "1";break; 845 case ClientOptions::NeverUseTLS: result += "1";break;
846 case ClientOptions::UseTLSWhenAvailable: result += "2";break; 846 case ClientOptions::UseTLSWhenAvailable: result += "2";break;
847 case ClientOptions::RequireTLS: result += "3";break; 847 case ClientOptions::RequireTLS: result += "3";break;
848 } 848 }
849 result += ","; 849 result += ",";
850 SERIALIZE_BOOL(allowPLAINWithoutTLS); 850 SERIALIZE_BOOL(allowPLAINWithoutTLS)
851 SERIALIZE_BOOL(useStreamResumption); 851 SERIALIZE_BOOL(useStreamResumption)
852 SERIALIZE_BOOL(useAcks); 852 SERIALIZE_BOOL(useAcks)
853 SERIALIZE_STRING(manualHostname); 853 SERIALIZE_STRING(manualHostname)
854 SERIALIZE_INT(manualPort); 854 SERIALIZE_INT(manualPort)
855 switch (options.proxyType) { 855 switch (options.proxyType) {
856 case ClientOptions::NoProxy: result += "1";break; 856 case ClientOptions::NoProxy: result += "1";break;
857 case ClientOptions::SystemConfiguredProxy: result += "2";break; 857 case ClientOptions::SystemConfiguredProxy: result += "2";break;
@@ -859,14 +859,14 @@ std::string AccountController::serializeClientOptions(const ClientOptions& optio
859 case ClientOptions::HTTPConnectProxy: result += "4";break; 859 case ClientOptions::HTTPConnectProxy: result += "4";break;
860 } 860 }
861 result += ","; 861 result += ",";
862 SERIALIZE_STRING(manualProxyHostname); 862 SERIALIZE_STRING(manualProxyHostname)
863 SERIALIZE_INT(manualProxyPort); 863 SERIALIZE_INT(manualProxyPort)
864 SERIALIZE_URL(boshURL); 864 SERIALIZE_URL(boshURL)
865 SERIALIZE_URL(boshHTTPConnectProxyURL); 865 SERIALIZE_URL(boshHTTPConnectProxyURL)
866 SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID); 866 SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID)
867 SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword); 867 SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword)
868 SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround); 868 SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround)
869 SERIALIZE_BOOL(singleSignOn); 869 SERIALIZE_BOOL(singleSignOn)
870 return result; 870 return result;
871} 871}
872 872