Browse Source

[Improve][Modularization][Module_OcppBackend]

2020.12.10 / Folus Wen

Actions:
1. Add LCCSCF_ALLOW_EXPIRED to TLS certification valid option.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 4 years ago
parent
commit
a83d7b25a0

+ 1 - 1
EVSE/Modularization/ocpp20/MessageHandler.c

@@ -15143,7 +15143,7 @@ int GetOcppServerURL()
 				OcppTempPath[0] = '\0';
 	        else
 	        {
-				if(url.path[strlen(url.path)-1] != '/')
+	        	if((url.path[strlen(url.path)-1] != '/') && (strlen(url.path) > 0))
 				{
 					sprintf(OcppTempPath, "%s/", url.path);
 				}

+ 1 - 1
EVSE/Modularization/ocpp20/Module_OcppBackend20.c

@@ -431,7 +431,7 @@ void* ConnectWsServer(void* data)  //int ConnectWsServer()
 	ConnInfo.ietf_version_or_minus_one = -1;
 
 	if(use_ssl)
-		ConnInfo.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED | LCCSCF_SKIP_SERVER_CERT_HOSTNAME_CHECK;
+		ConnInfo.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED | LCCSCF_SKIP_SERVER_CERT_HOSTNAME_CHECK | LCCSCF_ALLOW_EXPIRED;
 
 	wsi_client = lws_client_connect_via_info(&ConnInfo);
 	if (!wsi_client)

+ 1 - 1
EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -15089,7 +15089,7 @@ int GetOcppServerURL()
 				OcppTempPath[0] = '\0';
 			else
 			{
-				if(url.path[strlen(url.path)-1] != '/')
+				if((url.path[strlen(url.path)-1] != '/') && (strlen(url.path) > 0))
 				{
 					sprintf(OcppTempPath, "%s/", url.path);
 				}

+ 2 - 1
EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -488,7 +488,7 @@ void* ConnectWsServer(void* data)  //int ConnectWsServer()
 	ConnInfo.ietf_version_or_minus_one = -1;
 
 	if(use_ssl)
-		ConnInfo.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED | LCCSCF_SKIP_SERVER_CERT_HOSTNAME_CHECK;
+		ConnInfo.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED | LCCSCF_SKIP_SERVER_CERT_HOSTNAME_CHECK | LCCSCF_ALLOW_EXPIRED;
 
 	wsi_client = lws_client_connect_via_info(&ConnInfo);
 	if (!wsi_client)
@@ -1364,6 +1364,7 @@ int main(void)
 	struct stat stats;
 
 	DEBUG_INFO("Module_OcppBackend task initialization...\n");
+	//lws_set_log_level(LLL_PARSER | LLL_HEADER | LLL_ERR | LLL_WARN | LLL_NOTICE | LLL_INFO | LLL_DEBUG | LLL_EXT | LLL_CLIENT | LLL_LATENCY  , NULL);
 
 	if(ProcessShareMemory()== FAIL)
 	{