Mercurial > p > dcplusplus > code

changeset 3995:e72b0c30a895

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename SECURE_CLIENT_PROTOCOL_TEST to SECURE_CLIENT_PROTOCOL
author cologic <cologic@users.sourceforge.net>
date Sun, 05 May 2024 09:58:50 +0000
parents 8f6406972c64
children f39a89c15925
files dcpp/AdcHub.cpp dcpp/AdcHub.h
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/dcpp/AdcHub.cpp	Mon Apr 15 17:31:07 2024 +0200
+++ b/dcpp/AdcHub.cpp	Sun May 05 09:58:50 2024 +0000
@@ -45,7 +45,7 @@
 using std::make_pair;
 
 const string AdcHub::CLIENT_PROTOCOL("ADC/1.0");
-const string AdcHub::SECURE_CLIENT_PROTOCOL_TEST("ADCS/0.10");
+const string AdcHub::SECURE_CLIENT_PROTOCOL("ADCS/0.10");
 const string AdcHub::ADCS_FEATURE("ADC0");
 const string AdcHub::TCP4_FEATURE("TCP4");
 const string AdcHub::TCP6_FEATURE("TCP6");
@@ -341,7 +341,7 @@
 	bool secure = false;
 	if(protocol == CLIENT_PROTOCOL && !SETTING(REQUIRE_TLS)) {
 		// Nothing special
-	} else if(protocol == SECURE_CLIENT_PROTOCOL_TEST && CryptoManager::getInstance()->TLSOk()) {
+	} else if(protocol == SECURE_CLIENT_PROTOCOL && CryptoManager::getInstance()->TLSOk()) {
 		secure = true;
 	} else {
 		unknownProtocol(c.getFrom(), protocol, token);
@@ -371,7 +371,7 @@
 	bool secure;
 	if(protocol == CLIENT_PROTOCOL && !SETTING(REQUIRE_TLS)) {
 		secure = false;
-	} else if(protocol == SECURE_CLIENT_PROTOCOL_TEST && CryptoManager::getInstance()->TLSOk()) {
+	} else if(protocol == SECURE_CLIENT_PROTOCOL && CryptoManager::getInstance()->TLSOk()) {
 		secure = true;
 	} else {
 		unknownProtocol(c.getFrom(), protocol, token);
@@ -486,7 +486,7 @@
 			if(c.getParam("PR", 1, tmp)) {
 				if(tmp == CLIENT_PROTOCOL) {
 					u->getUser()->setFlag(User::NO_ADC_1_0_PROTOCOL);
-				} else if(tmp == SECURE_CLIENT_PROTOCOL_TEST) {
+				} else if(tmp == SECURE_CLIENT_PROTOCOL) {
 					u->getUser()->setFlag(User::NO_ADCS_0_10_PROTOCOL);
 					u->getUser()->unsetFlag(User::TLS);
 				}
@@ -597,7 +597,7 @@
 	bool secure = false;
 	if(protocol == CLIENT_PROTOCOL) {
 		// Nothing special
-	} else if(protocol == SECURE_CLIENT_PROTOCOL_TEST && CryptoManager::getInstance()->TLSOk()) {
+	} else if(protocol == SECURE_CLIENT_PROTOCOL && CryptoManager::getInstance()->TLSOk()) {
 		secure = true;
 	} else {
 		unknownProtocol(c.getFrom(), protocol, token);
@@ -632,7 +632,7 @@
 	bool secure = false;
 	if(protocol == CLIENT_PROTOCOL) {
 		// Nothing special
-	} else if(protocol == SECURE_CLIENT_PROTOCOL_TEST && CryptoManager::getInstance()->TLSOk()) {
+	} else if(protocol == SECURE_CLIENT_PROTOCOL && CryptoManager::getInstance()->TLSOk()) {
 		secure = true;
 	} else {
 		unknownProtocol(c.getFrom(), protocol, token);
@@ -678,7 +678,7 @@
 			/// @todo log
 			return;
 		}
-		proto = &SECURE_CLIENT_PROTOCOL_TEST;
+		proto = &SECURE_CLIENT_PROTOCOL;
 	} else {
 		if(user.getUser()->isSet(User::NO_ADC_1_0_PROTOCOL) || SETTING(REQUIRE_TLS)) {
 			/// @todo log, consider removing from queue
--- a/dcpp/AdcHub.h	Mon Apr 15 17:31:07 2024 +0200
+++ b/dcpp/AdcHub.h	Sun May 05 09:58:50 2024 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2023 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2024 Jacek Sieka, arnetheduck on gmail point com
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@
 	static StringList parseSearchExts(int flag);
 
 	static const string CLIENT_PROTOCOL;
-	static const string SECURE_CLIENT_PROTOCOL_TEST;
+	static const string SECURE_CLIENT_PROTOCOL;
 	static const string ADCS_FEATURE;
 	static const string TCP4_FEATURE;
 	static const string TCP6_FEATURE;