[Improve][Modularization][Module_OcppBackend / Module_OcppBackend20]

2021.08.26 / Folus Wen

Actions:
1. GPL software wget change to standalone version.
2. Firmware download from FTP server will retry by active mode if passive mode fail.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/ocpp20/MessageHandler.c

@@ -17394,8 +17394,6 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 	char ftpbuf[200];
 	int systemresult;
 
-	//DEBUG_INFO("filename=%s\n",filename);
-	//DEBUG_INFO("url=%s\n",url);
 	sprintf(FilePath,"/mnt/%s",filename);
 	system("ping 8.8.8.8 &");
 
@@ -17406,11 +17404,10 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 		system(rmFileCmd);
 	}
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
-			//sprintf(ftpbuf, "ftpput -u %s -p %s %s -P %d %s%s %s",user,password,IPbuffer,21,filename,filename,path);
-	systemresult = system(ftpbuf);
+	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
+	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
-	//DEBUG_INFO("systemresult=%d\n",systemresult);
+	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
 		DEBUG_INFO("http DownLoad error!\n");
@@ -17428,7 +17425,7 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 	char FilePath[100]={0};
 	char ftpbuf[200];
 	int systemresult;
-	//char temp[100];
+
 	sprintf(FilePath,"/mnt/%s",filename);
 	system("ping 8.8.8.8 &");
 
@@ -17442,16 +17439,20 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
 
 	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
-	//sprintf(ftpbuf, "ftpget -u %s -p %s %s -P %d %s %s%s",user,password,IPbuffer,port/*21*/,filename,path,filename); --- remove temporally
-	//DEBUG_INFO("ftpbuf=%s\n",ftpbuf);
-		//sprintf(ftpbuf, "ftpput -u %s -p %s %s -P %d %s%s %s",user,password,IPbuffer,21,filename,filename,path);
-	systemresult = system(ftpbuf);
+	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
-	//DEBUG_INFO("systemresult=%d\n",systemresult);
+	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		printf("wget error!\n");
-		result = FALSE;
+		sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
+		DEBUG_INFO("Download command: %s\n",ftpbuf);
+
+		systemresult = system(ftpbuf);
+		if(systemresult != 0)
+		{
+			DEBUG_WARN("wget error!\n");
+			result = FALSE;
+		}
 	}
 	system("pkill ping");
 

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -17658,8 +17658,6 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 	char ftpbuf[200];
 	int systemresult;
 
-	//DEBUG_INFO("filename=%s\n",filename);
-	//DEBUG_INFO("url=%s\n",url);
 	sprintf(FilePath,"/mnt/%s",filename);
 	system("ping 8.8.8.8 &");
 
@@ -17670,11 +17668,10 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 		system(rmFileCmd);
 	}
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
-			//sprintf(ftpbuf, "ftpput -u %s -p %s %s -P %d %s%s %s",user,password,IPbuffer,21,filename,filename,path);
-	systemresult = system(ftpbuf);
+	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
+	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
-	//DEBUG_INFO("systemresult=%d\n",systemresult);
+	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
 		DEBUG_INFO("http DownLoad error!\n");
@@ -17692,7 +17689,7 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 	char FilePath[100]={0};
 	char ftpbuf[200];
 	int systemresult;
-	//char temp[100];
+
 	sprintf(FilePath,"/mnt/%s",filename);
 	system("ping 8.8.8.8 &");
 
@@ -17706,16 +17703,20 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
 
 	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
-	//sprintf(ftpbuf, "ftpget -u %s -p %s %s -P %d %s %s%s",user,password,IPbuffer,port/*21*/,filename,path,filename); --- remove temporally
-	//DEBUG_INFO("ftpbuf=%s\n",ftpbuf);
-		//sprintf(ftpbuf, "ftpput -u %s -p %s %s -P %d %s%s %s",user,password,IPbuffer,21,filename,filename,path);
-	systemresult = system(ftpbuf);
+	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
-	//DEBUG_INFO("systemresult=%d\n",systemresult);
+	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		DEBUG_WARN("wget error!\n");
-		result = FALSE;
+		sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
+		DEBUG_INFO("Download command: %s\n",ftpbuf);
+
+		systemresult = system(ftpbuf);
+		if(systemresult != 0)
+		{
+			DEBUG_WARN("wget error!\n");
+			result = FALSE;
+		}
 	}
 	system("pkill ping");
 

EVSE/Modularization/ocppph/MessageHandler.c

@@ -17216,8 +17216,6 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 	char ftpbuf[200];
 	int systemresult;
 
-	//DEBUG_INFO("filename=%s\n",filename);
-	//DEBUG_INFO("url=%s\n",url);
 	sprintf(FilePath,"/mnt/%s",filename);
 	system("ping 8.8.8.8 &");
 
@@ -17228,11 +17226,10 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 		system(rmFileCmd);
 	}
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
-			//sprintf(ftpbuf, "ftpput -u %s -p %s %s -P %d %s%s %s",user,password,IPbuffer,21,filename,filename,path);
-	systemresult = system(ftpbuf);
+	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
+	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
-	//DEBUG_INFO("systemresult=%d\n",systemresult);
+	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
 		DEBUG_INFO("http DownLoad error!\n");
@@ -17250,7 +17247,7 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 	char FilePath[100]={0};
 	char ftpbuf[200];
 	int systemresult;
-	//char temp[100];
+
 	sprintf(FilePath,"/mnt/%s",filename);
 	system("ping 8.8.8.8 &");
 
@@ -17264,16 +17261,20 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
 
 	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
-	//sprintf(ftpbuf, "ftpget -u %s -p %s %s -P %d %s %s%s",user,password,IPbuffer,port/*21*/,filename,path,filename); --- remove temporally
-	//DEBUG_INFO("ftpbuf=%s\n",ftpbuf);
-		//sprintf(ftpbuf, "ftpput -u %s -p %s %s -P %d %s%s %s",user,password,IPbuffer,21,filename,filename,path);
-	systemresult = system(ftpbuf);
+	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
-	//DEBUG_INFO("systemresult=%d\n",systemresult);
+	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		DEBUG_WARN("wget error!\n");
-		result = FALSE;
+		sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
+		DEBUG_INFO("Download command: %s\n",ftpbuf);
+
+		systemresult = system(ftpbuf);
+		if(systemresult != 0)
+		{
+			DEBUG_WARN("wget error!\n");
+			result = FALSE;
+		}
 	}
 	system("pkill ping");
 

EVSE/rootfs/usr/bin/wget

@@ -1 +0,0 @@
-../../bin/busybox