|
@@ -2179,12 +2179,12 @@ int InitShareMemory()
|
|
|
//creat ShmOCPP16Data
|
|
|
if ((MeterSMId = shmget(ShmOcppModuleKey, sizeof(struct OCPP16Data), 0777)) < 0)
|
|
|
{
|
|
|
- DEBUG_ERROR("shmget ShmOCPP16Data NG");
|
|
|
+ DEBUG_ERROR("shmget ShmOCPP16Data NG\n");
|
|
|
result = FAIL;
|
|
|
}
|
|
|
else if ((ShmOCPP16Data = shmat(MeterSMId, NULL, 0)) == (void *) -1)
|
|
|
{
|
|
|
- DEBUG_ERROR("shmat ShmOCPP16Data NG");
|
|
|
+ DEBUG_ERROR("shmat ShmOCPP16Data NG\n");
|
|
|
result = FAIL;
|
|
|
}
|
|
|
else
|
|
@@ -11283,6 +11283,18 @@ int initialConfigurationTable(void)
|
|
|
//printf("Starting of the program, start_t = %ld\n", start_t);
|
|
|
memset(&(ShmOCPP16Data->ConfigurationTable), 0, sizeof(struct OCPP16ConfigurationTable) );
|
|
|
|
|
|
+ // Check configuration file size is correct
|
|
|
+ if((access("/Storage/OCPP/OCPPConfiguration",F_OK))!=-1)
|
|
|
+ {
|
|
|
+ struct stat st;
|
|
|
+ stat("/Storage/OCPP/OCPPConfiguration", &st);
|
|
|
+
|
|
|
+ if(st.st_size < 3100)
|
|
|
+ {
|
|
|
+ system("rm -f /Storage/OCPP/OCPPConfiguration");
|
|
|
+ DEBUG_INFO("OCPPConfiguration file size: %d is too small, restore to default value.\n", st.st_size);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if((access("/Storage/OCPP/OCPPConfiguration",F_OK))==-1)
|
|
|
{
|
|
@@ -12059,7 +12071,6 @@ int initialConfigurationTable(void)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
void StoreConfigurationTable(void)
|
|
|
{
|
|
|
FILE *outfile;
|
|
@@ -12531,7 +12542,6 @@ void StoreConfigurationTable(void)
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
void getKeyValue(char *keyReq)
|
|
|
{
|
|
|
int isEmpty = FALSE;
|