mirror of
				https://github.com/godotengine/godot.git
				synced 2025-11-01 06:01:14 +00:00 
			
		
		
		
	[Net] Rename "ssl" references to "tls" in methods and members.
This commit is contained in:
		
							parent
							
								
									fffdbb38e3
								
							
						
					
					
						commit
						a95d792420
					
				
					 46 changed files with 285 additions and 285 deletions
				
			
		|  | @ -48,34 +48,34 @@ Error WebSocketClient::connect_to_url(String p_url, const Vector<String> p_proto | |||
| 	Error err = p_url.parse_url(scheme, host, port, path); | ||||
| 	ERR_FAIL_COND_V_MSG(err != OK, err, "Invalid URL: " + p_url); | ||||
| 
 | ||||
| 	bool ssl = false; | ||||
| 	bool tls = false; | ||||
| 	if (scheme == "wss://") { | ||||
| 		ssl = true; | ||||
| 		tls = true; | ||||
| 	} | ||||
| 	if (port == 0) { | ||||
| 		port = ssl ? 443 : 80; | ||||
| 		port = tls ? 443 : 80; | ||||
| 	} | ||||
| 	if (path.is_empty()) { | ||||
| 		path = "/"; | ||||
| 	} | ||||
| 	return connect_to_host(host, path, port, ssl, p_protocols, p_custom_headers); | ||||
| 	return connect_to_host(host, path, port, tls, p_protocols, p_custom_headers); | ||||
| } | ||||
| 
 | ||||
| void WebSocketClient::set_verify_ssl_enabled(bool p_verify_ssl) { | ||||
| 	verify_ssl = p_verify_ssl; | ||||
| void WebSocketClient::set_verify_tls_enabled(bool p_verify_tls) { | ||||
| 	verify_tls = p_verify_tls; | ||||
| } | ||||
| 
 | ||||
| bool WebSocketClient::is_verify_ssl_enabled() const { | ||||
| 	return verify_ssl; | ||||
| bool WebSocketClient::is_verify_tls_enabled() const { | ||||
| 	return verify_tls; | ||||
| } | ||||
| 
 | ||||
| Ref<X509Certificate> WebSocketClient::get_trusted_ssl_certificate() const { | ||||
| 	return ssl_cert; | ||||
| Ref<X509Certificate> WebSocketClient::get_trusted_tls_certificate() const { | ||||
| 	return tls_cert; | ||||
| } | ||||
| 
 | ||||
| void WebSocketClient::set_trusted_ssl_certificate(Ref<X509Certificate> p_cert) { | ||||
| void WebSocketClient::set_trusted_tls_certificate(Ref<X509Certificate> p_cert) { | ||||
| 	ERR_FAIL_COND(get_connection_status() != CONNECTION_DISCONNECTED); | ||||
| 	ssl_cert = p_cert; | ||||
| 	tls_cert = p_cert; | ||||
| } | ||||
| 
 | ||||
| bool WebSocketClient::is_server() const { | ||||
|  | @ -123,15 +123,15 @@ void WebSocketClient::_bind_methods() { | |||
| 	ClassDB::bind_method(D_METHOD("disconnect_from_host", "code", "reason"), &WebSocketClient::disconnect_from_host, DEFVAL(1000), DEFVAL("")); | ||||
| 	ClassDB::bind_method(D_METHOD("get_connected_host"), &WebSocketClient::get_connected_host); | ||||
| 	ClassDB::bind_method(D_METHOD("get_connected_port"), &WebSocketClient::get_connected_port); | ||||
| 	ClassDB::bind_method(D_METHOD("set_verify_ssl_enabled", "enabled"), &WebSocketClient::set_verify_ssl_enabled); | ||||
| 	ClassDB::bind_method(D_METHOD("is_verify_ssl_enabled"), &WebSocketClient::is_verify_ssl_enabled); | ||||
| 	ClassDB::bind_method(D_METHOD("set_verify_tls_enabled", "enabled"), &WebSocketClient::set_verify_tls_enabled); | ||||
| 	ClassDB::bind_method(D_METHOD("is_verify_tls_enabled"), &WebSocketClient::is_verify_tls_enabled); | ||||
| 
 | ||||
| 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "verify_ssl", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_verify_ssl_enabled", "is_verify_ssl_enabled"); | ||||
| 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "verify_tls", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_verify_tls_enabled", "is_verify_tls_enabled"); | ||||
| 
 | ||||
| 	ClassDB::bind_method(D_METHOD("get_trusted_ssl_certificate"), &WebSocketClient::get_trusted_ssl_certificate); | ||||
| 	ClassDB::bind_method(D_METHOD("set_trusted_ssl_certificate", "cert"), &WebSocketClient::set_trusted_ssl_certificate); | ||||
| 	ClassDB::bind_method(D_METHOD("get_trusted_tls_certificate"), &WebSocketClient::get_trusted_tls_certificate); | ||||
| 	ClassDB::bind_method(D_METHOD("set_trusted_tls_certificate", "cert"), &WebSocketClient::set_trusted_tls_certificate); | ||||
| 
 | ||||
| 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "trusted_ssl_certificate", PROPERTY_HINT_RESOURCE_TYPE, "X509Certificate", PROPERTY_USAGE_NONE), "set_trusted_ssl_certificate", "get_trusted_ssl_certificate"); | ||||
| 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "trusted_tls_certificate", PROPERTY_HINT_RESOURCE_TYPE, "X509Certificate", PROPERTY_USAGE_NONE), "set_trusted_tls_certificate", "get_trusted_tls_certificate"); | ||||
| 
 | ||||
| 	ADD_SIGNAL(MethodInfo("data_received")); | ||||
| 	ADD_SIGNAL(MethodInfo("connection_established", PropertyInfo(Variant::STRING, "protocol"))); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Fabio Alessandrelli
						Fabio Alessandrelli